From: Jarkko Nikula Date: Sun, 13 May 2012 18:10:20 +0000 (+0300) Subject: USB: ehci-fsl: Use usb_put_transceiver instead of put_device X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fee8bc1c8ebec694650795b7c5b2fc98ead291db;p=linux-beck.git USB: ehci-fsl: 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 ehci->transceiver is allocated with usb_get_transceiver. While at there remove one extra ehci->transceiver test as the code block has already tested it. Signed-off-by: Jarkko Nikula Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index 34acfcee7405..43362577b54a 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -150,8 +150,7 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver, retval = otg_set_host(ehci->transceiver->otg, &ehci_to_hcd(ehci)->self); if (retval) { - if (ehci->transceiver) - put_device(ehci->transceiver->dev); + usb_put_transceiver(ehci->transceiver); goto err4; } } else { @@ -195,7 +194,7 @@ static void usb_hcd_fsl_remove(struct usb_hcd *hcd, if (ehci->transceiver) { otg_set_host(ehci->transceiver->otg, NULL); - put_device(ehci->transceiver->dev); + usb_put_transceiver(ehci->transceiver); } usb_remove_hcd(hcd);