Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0686a1fa authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Greg Kroah-Hartman
Browse files

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: default avatarJarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fee8bc1c

drivers/usb/host/ohci-omap.c

+2 −3
Original line number Diff line number Diff line
@@ -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);