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 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
drivers
/
media
/
video
/
gspca
/
konica.c
diff --git
a/drivers/media/video/gspca/konica.c
b/drivers/media/video/gspca/konica.c
index
f3f7fe0
..
9e0f5e2
100644
(file)
--- a/
drivers/media/video/gspca/konica.c
+++ b/
drivers/media/video/gspca/konica.c
@@
-290,6
+290,9
@@
static int sd_start(struct gspca_dev *gspca_dev)
return -EIO;
}
+ if (alt->desc.bNumEndpoints < 2)
+ return -ENODEV;
+
packet_size = le16_to_cpu(alt->endpoint[0].desc.wMaxPacketSize);
reg_w(gspca_dev, sd->brightness, BRIGHTNESS_REG);