From 72bc2f1b40a7af1592d83dcfdff525f649d1aa0e Mon Sep 17 00:00:00 2001 From: Erik Andren Date: Thu, 16 Oct 2008 16:36:35 -0300 Subject: [PATCH] --- yaml --- r: 115671 b: refs/heads/master c: 588dbbb520e454260fa6bd283ac77fe4678c1c38 h: refs/heads/master i: 115669: e1849ae75ed228279943481e25a57794679ffa3d 115667: e47f42d46a2836a888bc4c38bd7beb94d8bacc77 115663: b064802e6e98cd32c263523be68ca52ca9d95b07 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/m5602/m5602_core.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 281a862b23cb..dc43b4bcab22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcadd0826fce17e77cd6260569cbb3dd681c868c +refs/heads/master: 588dbbb520e454260fa6bd283ac77fe4678c1c38 diff --git a/trunk/drivers/media/video/gspca/m5602/m5602_core.c b/trunk/drivers/media/video/gspca/m5602/m5602_core.c index 19d5e351ccc1..a7021fcec2bf 100644 --- a/trunk/drivers/media/video/gspca/m5602/m5602_core.c +++ b/trunk/drivers/media/video/gspca/m5602/m5602_core.c @@ -146,16 +146,18 @@ static int m5602_start_transfer(struct gspca_dev *gspca_dev) { struct sd *sd = (struct sd *) gspca_dev; __u8 *buf = sd->gspca_dev.usb_buf; + int err; /* Send start command to the camera */ const u8 buffer[4] = {0x13, 0xf9, 0x0f, 0x01}; memcpy(buf, buffer, sizeof(buffer)); - usb_control_msg(gspca_dev->dev, usb_sndctrlpipe(gspca_dev->dev, 0), - 0x04, 0x40, 0x19, 0x0000, buf, - 4, M5602_URB_MSG_TIMEOUT); + err = usb_control_msg(gspca_dev->dev, + usb_sndctrlpipe(gspca_dev->dev, 0), + 0x04, 0x40, 0x19, 0x0000, buf, + 4, M5602_URB_MSG_TIMEOUT); PDEBUG(DBG_V4L2, "Transfer started"); - return 0; + return (err < 0) ? err : 0; } static void m5602_urb_complete(struct gspca_dev *gspca_dev,