aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192de/dm.c2
-rw-r--r--drivers/scsi/bfa/bfad_im.c2
-rw-r--r--drivers/scsi/hpsa.c2
-rw-r--r--drivers/scsi/lpfc/lpfc_bsg.c2
-rw-r--r--drivers/scsi/qla2xxx/qla_bsg.c2
-rw-r--r--drivers/tty/serial/kgdboc.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
index 47875ba09ff8..f700f7a614b2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
@@ -416,7 +416,7 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
416 416
417 /* because we will send data pkt when scanning 417 /* because we will send data pkt when scanning
418 * this will cause some ap like gear-3700 wep TP 418 * this will cause some ap like gear-3700 wep TP
419 * lower if we retrun here, this is the diff of 419 * lower if we return here, this is the diff of
420 * mac80211 driver vs ieee80211 driver */ 420 * mac80211 driver vs ieee80211 driver */
421 /* if (rtlpriv->mac80211.act_scanning) 421 /* if (rtlpriv->mac80211.act_scanning)
422 * return; */ 422 * return; */
diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c
index 9796284512a9..9967f9c14851 100644
--- a/drivers/scsi/bfa/bfad_im.c
+++ b/drivers/scsi/bfa/bfad_im.c
@@ -206,7 +206,7 @@ bfad_im_abort_handler(struct scsi_cmnd *cmnd)
206 spin_lock_irqsave(&bfad->bfad_lock, flags); 206 spin_lock_irqsave(&bfad->bfad_lock, flags);
207 hal_io = (struct bfa_ioim_s *) cmnd->host_scribble; 207 hal_io = (struct bfa_ioim_s *) cmnd->host_scribble;
208 if (!hal_io) { 208 if (!hal_io) {
209 /* IO has been completed, retrun success */ 209 /* IO has been completed, return success */
210 rc = SUCCESS; 210 rc = SUCCESS;
211 goto out; 211 goto out;
212 } 212 }
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 7f4f790a3d71..4cfa3af95b52 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -1054,7 +1054,7 @@ free_and_out:
1054} 1054}
1055 1055
1056/* 1056/*
1057 * Lookup bus/target/lun and retrun corresponding struct hpsa_scsi_dev_t * 1057 * Lookup bus/target/lun and return corresponding struct hpsa_scsi_dev_t *
1058 * Assume's h->devlock is held. 1058 * Assume's h->devlock is held.
1059 */ 1059 */
1060static struct hpsa_scsi_dev_t *lookup_hpsa_scsi_dev(struct ctlr_info *h, 1060static struct hpsa_scsi_dev_t *lookup_hpsa_scsi_dev(struct ctlr_info *h,
diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 6630520d295c..fcbedd6053c4 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -2627,7 +2627,7 @@ err_get_xri_exit:
2627 * @phba: Pointer to HBA context object 2627 * @phba: Pointer to HBA context object
2628 * 2628 *
2629 * This function allocates BSG_MBOX_SIZE (4KB) page size dma buffer and. 2629 * This function allocates BSG_MBOX_SIZE (4KB) page size dma buffer and.
2630 * retruns the pointer to the buffer. 2630 * returns the pointer to the buffer.
2631 **/ 2631 **/
2632static struct lpfc_dmabuf * 2632static struct lpfc_dmabuf *
2633lpfc_bsg_dma_page_alloc(struct lpfc_hba *phba) 2633lpfc_bsg_dma_page_alloc(struct lpfc_hba *phba)
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index 417eaad50ae2..5afdc3a25014 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -1882,7 +1882,7 @@ done:
1882 bsg_job->reply->reply_payload_rcv_len = 0; 1882 bsg_job->reply->reply_payload_rcv_len = 0;
1883 bsg_job->reply->result = (DID_OK) << 16; 1883 bsg_job->reply->result = (DID_OK) << 16;
1884 bsg_job->job_done(bsg_job); 1884 bsg_job->job_done(bsg_job);
1885 /* Always retrun success, vendor rsp carries correct status */ 1885 /* Always return success, vendor rsp carries correct status */
1886 return 0; 1886 return 0;
1887} 1887}
1888 1888
diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
index 10020547c60b..a260cde743e2 100644
--- a/drivers/tty/serial/kgdboc.c
+++ b/drivers/tty/serial/kgdboc.c
@@ -45,7 +45,7 @@ static int kgdboc_reset_connect(struct input_handler *handler,
45{ 45{
46 input_reset_device(dev); 46 input_reset_device(dev);
47 47
48 /* Retrun an error - we do not want to bind, just to reset */ 48 /* Return an error - we do not want to bind, just to reset */
49 return -ENODEV; 49 return -ENODEV;
50} 50}
51 51