Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303929
b: refs/heads/master
c: fee8bc1
h: refs/heads/master
i:
  303927: 55bcee3
v: v3
  • Loading branch information
Jarkko Nikula authored and Greg Kroah-Hartman committed May 14, 2012
1 parent 9b223a7 commit 4549810
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: bebc56d58dc780539777d2b1ca80df5566e2ad87
refs/heads/master: fee8bc1c8ebec694650795b7c5b2fc98ead291db
5 changes: 2 additions & 3 deletions trunk/drivers/usb/host/ehci-fsl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 4549810

Please sign in to comment.