aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/radio/wl128x/fmdrv_common.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 14:14:49 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 14:14:49 -0400
commit42933bac11e811f02200c944d8562a15f8ec4ff0 (patch)
treefcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/media/radio/wl128x/fmdrv_common.c
parent2b9accbee563f535046ff2cd382d0acaa92e130c (diff)
parent25985edcedea6396277003854657b5f3cb31a628 (diff)
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6: Fix common misspellings
Diffstat (limited to 'drivers/media/radio/wl128x/fmdrv_common.c')
-rw-r--r--drivers/media/radio/wl128x/fmdrv_common.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
index ecfd9fb167d8..5991ab60303d 100644
--- a/drivers/media/radio/wl128x/fmdrv_common.c
+++ b/drivers/media/radio/wl128x/fmdrv_common.c
@@ -352,7 +352,7 @@ static void send_tasklet(unsigned long arg)
352 if (!atomic_read(&fmdev->tx_cnt)) 352 if (!atomic_read(&fmdev->tx_cnt))
353 return; 353 return;
354 354
355 /* Check, is there any timeout happenned to last transmitted packet */ 355 /* Check, is there any timeout happened to last transmitted packet */
356 if ((jiffies - fmdev->last_tx_jiffies) > FM_DRV_TX_TIMEOUT) { 356 if ((jiffies - fmdev->last_tx_jiffies) > FM_DRV_TX_TIMEOUT) {
357 fmerr("TX timeout occurred\n"); 357 fmerr("TX timeout occurred\n");
358 atomic_set(&fmdev->tx_cnt, 1); 358 atomic_set(&fmdev->tx_cnt, 1);
@@ -478,7 +478,7 @@ u32 fmc_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,
478 return -ETIMEDOUT; 478 return -ETIMEDOUT;
479 } 479 }
480 if (!fmdev->resp_skb) { 480 if (!fmdev->resp_skb) {
481 fmerr("Reponse SKB is missing\n"); 481 fmerr("Response SKB is missing\n");
482 return -EFAULT; 482 return -EFAULT;
483 } 483 }
484 spin_lock_irqsave(&fmdev->resp_skb_lock, flags); 484 spin_lock_irqsave(&fmdev->resp_skb_lock, flags);
@@ -1598,7 +1598,7 @@ u32 fmc_release(struct fmdev *fmdev)
1598 fmdbg("FM Core is already down\n"); 1598 fmdbg("FM Core is already down\n");
1599 return 0; 1599 return 0;
1600 } 1600 }
1601 /* Sevice pending read */ 1601 /* Service pending read */
1602 wake_up_interruptible(&fmdev->rx.rds.read_queue); 1602 wake_up_interruptible(&fmdev->rx.rds.read_queue);
1603 1603
1604 tasklet_kill(&fmdev->tx_task); 1604 tasklet_kill(&fmdev->tx_task);