aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/isdn/mISDN/dsp_cmx.c2
-rw-r--r--drivers/scsi/lpfc/lpfc_init.c2
-rw-r--r--drivers/usb/gadget/langwell_udc.c4
-rw-r--r--drivers/usb/host/fhci-hcd.c4
-rw-r--r--drivers/usb/host/fhci-tds.c4
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
index 76d9e673b4e1..309bacf1fadc 100644
--- a/drivers/isdn/mISDN/dsp_cmx.c
+++ b/drivers/isdn/mISDN/dsp_cmx.c
@@ -112,7 +112,7 @@
112 * Disable rx-data: 112 * Disable rx-data:
113 * If cmx is realized in hardware, rx data will be disabled if requested by 113 * If cmx is realized in hardware, rx data will be disabled if requested by
114 * the upper layer. If dtmf decoding is done by software and enabled, rx data 114 * the upper layer. If dtmf decoding is done by software and enabled, rx data
115 * will not be diabled but blocked to the upper layer. 115 * will not be disabled but blocked to the upper layer.
116 * 116 *
117 * HFC conference engine: 117 * HFC conference engine:
118 * If it is possible to realize all features using hardware, hardware will be 118 * If it is possible to realize all features using hardware, hardware will be
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index b3065791f303..a921f168df80 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -7661,7 +7661,7 @@ lpfc_pci_remove_one_s3(struct pci_dev *pdev)
7661 * the HBA. 7661 * the HBA.
7662 */ 7662 */
7663 7663
7664 /* HBA interrupt will be diabled after this call */ 7664 /* HBA interrupt will be disabled after this call */
7665 lpfc_sli_hba_down(phba); 7665 lpfc_sli_hba_down(phba);
7666 /* Stop kthread signal shall trigger work_done one more time */ 7666 /* Stop kthread signal shall trigger work_done one more time */
7667 kthread_stop(phba->worker_thread); 7667 kthread_stop(phba->worker_thread);
diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c
index b8ec954c0692..dad278fe0555 100644
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@ -3063,7 +3063,7 @@ static void langwell_udc_remove(struct pci_dev *pdev)
3063 3063
3064 kfree(dev->ep); 3064 kfree(dev->ep);
3065 3065
3066 /* diable IRQ handler */ 3066 /* disable IRQ handler */
3067 if (dev->got_irq) 3067 if (dev->got_irq)
3068 free_irq(pdev->irq, dev); 3068 free_irq(pdev->irq, dev);
3069 3069
@@ -3383,7 +3383,7 @@ static int langwell_udc_suspend(struct pci_dev *pdev, pm_message_t state)
3383 /* disable interrupt and set controller to stop state */ 3383 /* disable interrupt and set controller to stop state */
3384 langwell_udc_stop(dev); 3384 langwell_udc_stop(dev);
3385 3385
3386 /* diable IRQ handler */ 3386 /* disable IRQ handler */
3387 if (dev->got_irq) 3387 if (dev->got_irq)
3388 free_irq(pdev->irq, dev); 3388 free_irq(pdev->irq, dev);
3389 dev->got_irq = 0; 3389 dev->got_irq = 0;
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 */
102void fhci_usb_disable_interrupt(struct fhci_usb *usb) 102void 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 */
diff --git a/drivers/usb/host/fhci-tds.c b/drivers/usb/host/fhci-tds.c
index 7be548ca2183..38fe058fbe61 100644
--- a/drivers/usb/host/fhci-tds.c
+++ b/drivers/usb/host/fhci-tds.c
@@ -271,8 +271,8 @@ void fhci_init_ep_registers(struct fhci_usb *usb, struct endpoint *ep,
271 271
272/* 272/*
273 * Collect the submitted frames and inform the application about them 273 * Collect the submitted frames and inform the application about them
274 * It is also prepearing the TDs for new frames. If the Tx interrupts 274 * It is also preparing the TDs for new frames. If the Tx interrupts
275 * are diabled, the application should call that routine to get 275 * are disabled, the application should call that routine to get
276 * confirmation about the submitted frames. Otherwise, the routine is 276 * confirmation about the submitted frames. Otherwise, the routine is
277 * called frome the interrupt service routine during the Tx interrupt. 277 * called frome the interrupt service routine during the Tx interrupt.
278 * In that case the application is informed by calling the application 278 * In that case the application is informed by calling the application