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 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
bw-qcam.c
diff --git
a/drivers/media/video/bw-qcam.c
b/drivers/media/video/bw-qcam.c
index
10dbd4a
..
9e39bc5
100644
(file)
--- a/
drivers/media/video/bw-qcam.c
+++ b/
drivers/media/video/bw-qcam.c
@@
-992,7
+992,7
@@
static int accept_bwqcam(struct parport *port)
if (parport[0] && strncmp(parport[0], "auto", 4) != 0) {
/* user gave parport parameters */
if (parport[0] && strncmp(parport[0], "auto", 4) != 0) {
/* user gave parport parameters */
- for
(n=0; parport[n] && n<MAX_CAMS; n++)
{
+ for
(n = 0; n < MAX_CAMS && parport[n]; n++)
{
char *ep;
unsigned long r;
r = simple_strtoul(parport[n], &ep, 0);
char *ep;
unsigned long r;
r = simple_strtoul(parport[n], &ep, 0);