diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/media/video/tcm825x.c | |
parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
parent | 25985edcedea6396277003854657b5f3cb31a628 (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/video/tcm825x.c')
-rw-r--r-- | drivers/media/video/tcm825x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/tcm825x.c b/drivers/media/video/tcm825x.c index 54681a535822..b6ee1bd342dc 100644 --- a/drivers/media/video/tcm825x.c +++ b/drivers/media/video/tcm825x.c | |||
@@ -493,7 +493,7 @@ static int ioctl_g_ctrl(struct v4l2_int_device *s, | |||
493 | int val, r; | 493 | int val, r; |
494 | struct vcontrol *lvc; | 494 | struct vcontrol *lvc; |
495 | 495 | ||
496 | /* exposure time is special, spread accross 2 registers */ | 496 | /* exposure time is special, spread across 2 registers */ |
497 | if (vc->id == V4L2_CID_EXPOSURE) { | 497 | if (vc->id == V4L2_CID_EXPOSURE) { |
498 | int val_lower, val_upper; | 498 | int val_lower, val_upper; |
499 | 499 | ||
@@ -538,7 +538,7 @@ static int ioctl_s_ctrl(struct v4l2_int_device *s, | |||
538 | struct vcontrol *lvc; | 538 | struct vcontrol *lvc; |
539 | int val = vc->value; | 539 | int val = vc->value; |
540 | 540 | ||
541 | /* exposure time is special, spread accross 2 registers */ | 541 | /* exposure time is special, spread across 2 registers */ |
542 | if (vc->id == V4L2_CID_EXPOSURE) { | 542 | if (vc->id == V4L2_CID_EXPOSURE) { |
543 | int val_lower, val_upper; | 543 | int val_lower, val_upper; |
544 | val_lower = val & TCM825X_MASK(TCM825X_ESRSPD_L); | 544 | val_lower = val & TCM825X_MASK(TCM825X_ESRSPD_L); |