lkml.org 
[lkml]   [2008]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 3/3] ieee1394: ohci1394: missing PPC PMac feature calls in failure path
The failure path of ohci1394_pci_probe() reuses ohci1394_pci_remove().
Doing so it missed to call ohci1394_pmac_off() in a few unlikely early
error cases.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
drivers/ieee1394/ohci1394.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: linux/drivers/ieee1394/ohci1394.c
===================================================================
--- linux.orig/drivers/ieee1394/ohci1394.c
+++ linux/drivers/ieee1394/ohci1394.c
@@ -3242,7 +3242,7 @@ static void ohci1394_pci_remove(struct p

ohci = pci_get_drvdata(dev);
if (!ohci)
- return;
+ goto out;

device = get_device(&ohci->host->device);

@@ -3305,14 +3305,14 @@ static void ohci1394_pci_remove(struct p
release_mem_region(pci_resource_start(dev, 0),
OHCI1394_REGISTER_SIZE);

- ohci1394_pmac_off(dev);
-
case OHCI_INIT_ALLOC_HOST:
pci_set_drvdata(dev, NULL);
}

if (device)
put_device(device);
+out:
+ ohci1394_pmac_off(dev);
}

#ifdef CONFIG_PM
--
Stefan Richter
-=====-==--- --== ==---
http://arcgraph.de/sr/


\
 
 \ /
  Last update: 2008-03-24 20:59    [from the cache]
©2003-2011 Jasper Spaans