Merge tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[deliverable/linux.git] / drivers / usb / host / ohci-omap.c

diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 71229cb97e3e54dd1788bdcf715d286f0e018477..9ce35d0d9d5daad531209e6b651a1fcc714efb18 100644 (file)
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -218,8 +218,7 @@ static int ohci_omap_init(struct usb_hcd *hcd)
                        dev_dbg(hcd->self.controller, "init %s transceiver, status %d\n",
                                        ohci->transceiver->label, status);
                        if (status) {
-                               if (ohci->transceiver)
-                                       put_device(ohci->transceiver->dev);
+                               usb_put_transceiver(ohci->transceiver);
                                return status;
                        }
                } else {
@@ -406,7 +405,7 @@ usb_hcd_omap_remove (struct usb_hcd *hcd, struct platform_device *pdev)
        usb_remove_hcd(hcd);
        if (ohci->transceiver) {
                (void) otg_set_host(ohci->transceiver->otg, 0);
-               put_device(ohci->transceiver->dev);
+               usb_put_transceiver(ohci->transceiver);
        }
        if (machine_is_omap_osk())
                gpio_free(9);