From: Stefan Richter Date: Mon, 24 Mar 2008 19:53:34 +0000 (+0100) Subject: ieee1394: ohci1394: missing PPC PMac feature calls in failure path X-Git-Tag: v2.6.26-rc1~1141^2~33 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=9508c208aa6e0a7501d8250d4a9d35344056d573;p=linux-2.6-omap-h63xx.git 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 --- diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index 9e304c3cea2..0690469fcec 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c @@ -3242,7 +3242,7 @@ static void ohci1394_pci_remove(struct pci_dev *dev) 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 pci_dev *dev) 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