aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Andrén <erik.andren@gmail.com>2008-11-20 01:41:44 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 06:39:45 -0500
commit619a4d5ca127e80583fb9d269681164363be983e (patch)
tree7a192a38490dcb55f29edf2534555e5844093258
parent84833a3f4e22907379462e8a7c18970db70d21d8 (diff)
V4L/DVB (10001): gspca - m5602: Minor fixes
Signed-off-by: Erik Andrén <erik.andren@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/gspca/m5602/m5602_bridge.h1
-rw-r--r--drivers/media/video/gspca/m5602/m5602_core.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_bridge.h b/drivers/media/video/gspca/m5602/m5602_bridge.h
index c1c7ce524f8a..35db1bb9d576 100644
--- a/drivers/media/video/gspca/m5602/m5602_bridge.h
+++ b/drivers/media/video/gspca/m5602/m5602_bridge.h
@@ -109,7 +109,6 @@ static const unsigned char sensor_urb_skeleton[] = {
109 0x13, M5602_XB_I2C_CTRL, 0x81, 0x11 109 0x13, M5602_XB_I2C_CTRL, 0x81, 0x11
110}; 110};
111 111
112/* m5602 device descriptor, currently it just wraps the m5602_camera struct */
113struct sd { 112struct sd {
114 struct gspca_dev gspca_dev; 113 struct gspca_dev gspca_dev;
115 114
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c
index 059c4d2ffbc2..b2a5ad4fea59 100644
--- a/drivers/media/video/gspca/m5602/m5602_core.c
+++ b/drivers/media/video/gspca/m5602/m5602_core.c
@@ -150,11 +150,12 @@ static int m5602_start_transfer(struct gspca_dev *gspca_dev)
150 150
151 /* Send start command to the camera */ 151 /* Send start command to the camera */
152 const u8 buffer[4] = {0x13, 0xf9, 0x0f, 0x01}; 152 const u8 buffer[4] = {0x13, 0xf9, 0x0f, 0x01};
153
153 memcpy(buf, buffer, sizeof(buffer)); 154 memcpy(buf, buffer, sizeof(buffer));
154 err = usb_control_msg(gspca_dev->dev, 155 err = usb_control_msg(gspca_dev->dev,
155 usb_sndctrlpipe(gspca_dev->dev, 0), 156 usb_sndctrlpipe(gspca_dev->dev, 0),
156 0x04, 0x40, 0x19, 0x0000, buf, 157 0x04, 0x40, 0x19, 0x0000, buf,
157 4, M5602_URB_MSG_TIMEOUT); 158 sizeof(buffer), M5602_URB_MSG_TIMEOUT);
158 159
159 PDEBUG(D_STREAM, "Transfer started"); 160 PDEBUG(D_STREAM, "Transfer started");
160 return (err < 0) ? err : 0; 161 return (err < 0) ? err : 0;
@@ -284,6 +285,7 @@ static int __init mod_m5602_init(void)
284 PDEBUG(D_PROBE, "registered"); 285 PDEBUG(D_PROBE, "registered");
285 return 0; 286 return 0;
286} 287}
288
287static void __exit mod_m5602_exit(void) 289static void __exit mod_m5602_exit(void)
288{ 290{
289 usb_deregister(&sd_driver); 291 usb_deregister(&sd_driver);