Skip to content

Commit

Permalink
USB: ohci-omap: Use usb_put_transceiver instead of put_device
Browse files Browse the repository at this point in the history
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 <jarkko.nikula@bitmer.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Jarkko Nikula authored and Greg Kroah-Hartman committed May 14, 2012
1 parent fee8bc1 commit 0686a1f
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/usb/host/ohci-omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 0686a1f

Please sign in to comment.