git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
gspca
/
mars.c
diff --git
a/drivers/media/video/gspca/mars.c
b/drivers/media/video/gspca/mars.c
index
cb4d0bf
..
0196209
100644
(file)
--- a/
drivers/media/video/gspca/mars.c
+++ b/
drivers/media/video/gspca/mars.c
@@
-361,7
+361,7
@@
static int sd_start(struct gspca_dev *gspca_dev)
mi_w(gspca_dev, i + 1, mi_data[i]);
data[0] = 0x00;
- data[1] = 0x4d; /* ISOC transfering enable... */
+ data[1] = 0x4d; /* ISOC transfer
r
ing enable... */
reg_w(gspca_dev, 2);
gspca_dev->ctrl_inac = 0; /* activate the illuminator controls */