Skip to content

Commit

Permalink
V4L/DVB (10001): gspca - m5602: Minor fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Erik Andrén authored and Mauro Carvalho Chehab committed Dec 30, 2008
1 parent 84833a3 commit 619a4d5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 0 additions & 1 deletion drivers/media/video/gspca/m5602/m5602_bridge.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ static const unsigned char sensor_urb_skeleton[] = {
0x13, M5602_XB_I2C_CTRL, 0x81, 0x11
};

/* m5602 device descriptor, currently it just wraps the m5602_camera struct */
struct sd {
struct gspca_dev gspca_dev;

Expand Down
4 changes: 3 additions & 1 deletion drivers/media/video/gspca/m5602/m5602_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,12 @@ static int m5602_start_transfer(struct gspca_dev *gspca_dev)

/* Send start command to the camera */
const u8 buffer[4] = {0x13, 0xf9, 0x0f, 0x01};

memcpy(buf, buffer, sizeof(buffer));
err = usb_control_msg(gspca_dev->dev,
usb_sndctrlpipe(gspca_dev->dev, 0),
0x04, 0x40, 0x19, 0x0000, buf,
4, M5602_URB_MSG_TIMEOUT);
sizeof(buffer), M5602_URB_MSG_TIMEOUT);

PDEBUG(D_STREAM, "Transfer started");
return (err < 0) ? err : 0;
Expand Down Expand Up @@ -284,6 +285,7 @@ static int __init mod_m5602_init(void)
PDEBUG(D_PROBE, "registered");
return 0;
}

static void __exit mod_m5602_exit(void)
{
usb_deregister(&sd_driver);
Expand Down

0 comments on commit 619a4d5

Please sign in to comment.