aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/gspca/jeilinj.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/usb/gspca/jeilinj.c')
-rw-r--r--drivers/media/usb/gspca/jeilinj.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/usb/gspca/jeilinj.c b/drivers/media/usb/gspca/jeilinj.c
index b897aa86f315..1ba29fe7fada 100644
--- a/drivers/media/usb/gspca/jeilinj.c
+++ b/drivers/media/usb/gspca/jeilinj.c
@@ -114,7 +114,7 @@ static void jlj_write2(struct gspca_dev *gspca_dev, unsigned char *command)
114} 114}
115 115
116/* Responses are one byte only */ 116/* Responses are one byte only */
117static void jlj_read1(struct gspca_dev *gspca_dev, unsigned char response) 117static void jlj_read1(struct gspca_dev *gspca_dev, unsigned char *response)
118{ 118{
119 int retval; 119 int retval;
120 120
@@ -123,7 +123,7 @@ static void jlj_read1(struct gspca_dev *gspca_dev, unsigned char response)
123 retval = usb_bulk_msg(gspca_dev->dev, 123 retval = usb_bulk_msg(gspca_dev->dev,
124 usb_rcvbulkpipe(gspca_dev->dev, 0x84), 124 usb_rcvbulkpipe(gspca_dev->dev, 0x84),
125 gspca_dev->usb_buf, 1, NULL, 500); 125 gspca_dev->usb_buf, 1, NULL, 500);
126 response = gspca_dev->usb_buf[0]; 126 *response = gspca_dev->usb_buf[0];
127 if (retval < 0) { 127 if (retval < 0) {
128 pr_err("read command [%02x] error %d\n", 128 pr_err("read command [%02x] error %d\n",
129 gspca_dev->usb_buf[0], retval); 129 gspca_dev->usb_buf[0], retval);
@@ -260,7 +260,7 @@ static int jlj_start(struct gspca_dev *gspca_dev)
260 if (start_commands[i].delay) 260 if (start_commands[i].delay)
261 msleep(start_commands[i].delay); 261 msleep(start_commands[i].delay);
262 if (start_commands[i].ack_wanted) 262 if (start_commands[i].ack_wanted)
263 jlj_read1(gspca_dev, response); 263 jlj_read1(gspca_dev, &response);
264 } 264 }
265 setcamquality(gspca_dev, v4l2_ctrl_g_ctrl(sd->jpegqual)); 265 setcamquality(gspca_dev, v4l2_ctrl_g_ctrl(sd->jpegqual));
266 msleep(2); 266 msleep(2);