diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 23:10:38 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 23:10:38 +0100 |
commit | 9f33be2c3a80bdc2cc08342dd77fac87652e0548 (patch) | |
tree | 7ad6e825427a15c5ec0fc15540abc0429d7f4bce /drivers/usb/host/fhci-hcd.c | |
parent | Merge branch 'misc2' into devel (diff) | |
parent | ARM: PNX4008: use msecs_to_jiffies() rather than open-coding it (diff) | |
download | linux-9f33be2c3a80bdc2cc08342dd77fac87652e0548.tar.xz linux-9f33be2c3a80bdc2cc08342dd77fac87652e0548.zip |
Merge branches 'clks' and 'pnx' into devel
Diffstat (limited to 'drivers/usb/host/fhci-hcd.c')
-rw-r--r-- | drivers/usb/host/fhci-hcd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c index 0951818ef93b..78e7c3cfcb72 100644 --- a/drivers/usb/host/fhci-hcd.c +++ b/drivers/usb/host/fhci-hcd.c @@ -242,9 +242,10 @@ err: static void fhci_usb_free(void *lld) { struct fhci_usb *usb = lld; - struct fhci_hcd *fhci = usb->fhci; + struct fhci_hcd *fhci; if (usb) { + fhci = usb->fhci; fhci_config_transceiver(fhci, FHCI_PORT_POWER_OFF); fhci_ep0_free(usb); kfree(usb->actual_frame); |