From 0686a1fab07ecd1ec42e7bc6b0dd2f567378da30 Mon Sep 17 00:00:00 2001 From: Jarkko Nikula Date: Sun, 13 May 2012 21:10:43 +0300 Subject: [PATCH] USB: ohci-omap: Use usb_put_transceiver instead of put_device Currently usb_put_transceiver calls put_device so this is a no-op but it is better to keep API usage consistent as ohci->transceiver is allocated with usb_get_transceiver. While at there remove one extra ohci->transceiver test as the code block has already tested it. Signed-off-by: Jarkko Nikula Acked-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/ohci-omap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 96451e41ee8a..74b53203239e 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c @@ -217,8 +217,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 { @@ -405,7 +404,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); -- 2.11.4.GIT