diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
| commit | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch) | |
| tree | 6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /drivers/usb/host/fhci-hcd.c | |
| parent | c506653d35249bb4738bb139c24362e1ae724bc1 (diff) | |
| parent | ec30f343d61391ab23705e50a525da1d55395780 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/host/fhci-hcd.c')
| -rw-r--r-- | drivers/usb/host/fhci-hcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c index 20092a27a1e8..12fd184226f2 100644 --- a/drivers/usb/host/fhci-hcd.c +++ b/drivers/usb/host/fhci-hcd.c | |||
| @@ -98,13 +98,13 @@ void fhci_usb_enable_interrupt(struct fhci_usb *usb) | |||
| 98 | usb->intr_nesting_cnt--; | 98 | usb->intr_nesting_cnt--; |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | /* diable the usb interrupt */ | 101 | /* disable the usb interrupt */ |
| 102 | void fhci_usb_disable_interrupt(struct fhci_usb *usb) | 102 | void fhci_usb_disable_interrupt(struct fhci_usb *usb) |
| 103 | { | 103 | { |
| 104 | struct fhci_hcd *fhci = usb->fhci; | 104 | struct fhci_hcd *fhci = usb->fhci; |
| 105 | 105 | ||
| 106 | if (usb->intr_nesting_cnt == 0) { | 106 | if (usb->intr_nesting_cnt == 0) { |
| 107 | /* diable the timer interrupt */ | 107 | /* disable the timer interrupt */ |
| 108 | disable_irq_nosync(fhci->timer->irq); | 108 | disable_irq_nosync(fhci->timer->irq); |
| 109 | 109 | ||
| 110 | /* disable the usb interrupt */ | 110 | /* disable the usb interrupt */ |