Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303930
b: refs/heads/master
c: 0686a1f
h: refs/heads/master
v: v3
  • Loading branch information
Jarkko Nikula authored and Greg Kroah-Hartman committed May 14, 2012
1 parent 4549810 commit efcf13c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fee8bc1c8ebec694650795b7c5b2fc98ead291db
refs/heads/master: 0686a1fab07ecd1ec42e7bc6b0dd2f567378da30
5 changes: 2 additions & 3 deletions trunk/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 efcf13c

Please sign in to comment.