summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/fhci-hcd.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 23:10:38 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 23:10:38 +0100
commit9f33be2c3a80bdc2cc08342dd77fac87652e0548 (patch)
tree7ad6e825427a15c5ec0fc15540abc0429d7f4bce /drivers/usb/host/fhci-hcd.c
parentMerge branch 'misc2' into devel (diff)
parentARM: PNX4008: use msecs_to_jiffies() rather than open-coding it (diff)
downloadlinux-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.c3
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);