diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-13 11:38:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-13 11:38:19 -0300 |
| commit | ad47445b687bfd00ddcbc0aa466a95be2bbc6016 (patch) | |
| tree | 97da3e3c5dfb06db9846fca5888c7a23ba87b6ad /linux/drivers/media | |
| parent | 297500590ef648926471c017b364f57dd8616504 (diff) | |
| download | mediapointer-dvb-s2-ad47445b687bfd00ddcbc0aa466a95be2bbc6016.tar.gz mediapointer-dvb-s2-ad47445b687bfd00ddcbc0aa466a95be2bbc6016.tar.bz2 | |
backport changeset 30686ba6d56858657829d3eb524ed73e5dc98d2b
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
backport patch from Stephen Rothwell <sfr@canb.auug.org.au>
[POWERPC] Remove old interface find_devices
Replace uses with of_find_node_by_name and for_each_node_by_name.
planb driver is marked as broken. I dunno if those changes would fix the
driver or not. The original patch didn't changed the "broken" status for
planb.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/planb.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/video/planb.c b/linux/drivers/media/video/planb.c index c6f2dc6cf..b399806af 100644 --- a/linux/drivers/media/video/planb.c +++ b/linux/drivers/media/video/planb.c @@ -2169,7 +2169,7 @@ static int find_planb(void) if (!machine_is(powermac)) return 0; - planb_devices = find_devices("planb"); + planb_devices = of_find_node_by_name(NULL, "planb"); if (planb_devices == 0) { planb_num=0; printk(KERN_WARNING "PlanB: no device found!\n"); @@ -2184,12 +2184,14 @@ static int find_planb(void) if (planb_devices->n_addrs != 1) { printk (KERN_WARNING "PlanB: expecting 1 address for planb " "(got %d)", planb_devices->n_addrs); + of_node_put(planb_devices); return 0; } if (planb_devices->n_intrs == 0) { printk(KERN_WARNING "PlanB: no intrs for device %s\n", planb_devices->full_name); + of_node_put(planb_devices); return 0; } else { irq = planb_devices->intrs[0].line; @@ -2211,6 +2213,7 @@ static int find_planb(void) confreg = planb_devices->addrs[0].space & 0xff; old_base = planb_devices->addrs[0].address; new_base = 0xf1000000; + of_node_put(planb_devices); DEBUG("PlanB: Found on bus %d, dev %d, func %d, " "membase 0x%x (base reg. 0x%x)\n", |