gspca pac7302/pac7311: handle return value of usb_control_msg()
PATCH 1/1 gspca pac7302/pac7311: handle return value of usb_control_msg()
From: Márton Németh <[email protected]>
The function usb_control_msg() can return error any time so at least warn the user if an error happens. No message is printed in case of normal operation.
Signed-off-by Márton Németh <[email protected]>
---
linux/drivers/media/video/gspca/pac7302.c +29 -4
@@ -335,27 +335,40 @@__u8 index, const char *buffer, int len) { + int ret; +memcpy (gspca_dev->usb_buf, buffer, len); -usb_control_msg (gspca_dev->dev, + ret =usb_control_msg (gspca_dev->dev,usb_sndctrlpipe (gspca_dev->dev,0 ),1 ,/* request */ USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 ,/* value */ index, gspca_dev->usb_buf, len,500 ); +if (ret <0 ) +PDEBUG (D_ERR ,"reg_w_buf(): " +"Failed to write registers to index 0x%x, error %i" , + index, ret); }#if 0 /* not used */ static __u8 reg_r (struct gspca_dev *gspca_dev,__u8 index) { -usb_control_msg (gspca_dev->dev, +int ret; + + ret =usb_control_msg (gspca_dev->dev,usb_rcvctrlpipe (gspca_dev->dev,0 ),0 ,/* request */ USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 ,/* value */ index, gspca_dev->usb_buf,1 ,500 ); +if (ret <0 ) +PDEBUG (D_ERR ,"reg_r(): " +"Failed to read register from index 0x%x, error %i" , + index, ret); +return gspca_dev->usb_buf[0 ]; }#endif
@@ -364,13 +377,19 @@__u8 index, __u8 value) { + int ret; + gspca_dev->usb_buf[0 ] = value; -usb_control_msg (gspca_dev->dev, + ret =usb_control_msg (gspca_dev->dev,usb_sndctrlpipe (gspca_dev->dev,0 ),0 ,/* request */ USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 , index, gspca_dev->usb_buf,1 ,500 ); +if (ret <0 ) +PDEBUG (D_ERR ,"reg_w(): " +"Failed to write register to index 0x%x, value 0x%x, error %i" , + index, value, ret); } static void reg_w_seq(struct gspca_dev *gspca_dev,
@@ -387,17 +406,23 @@ const __u8 *page, int len) { int index; +int ret;for (index =0 ; index < len; index++) {if (page[index] ==SKIP )/* skip this index */ continue ; gspca_dev->usb_buf[0 ] = page[index]; -usb_control_msg (gspca_dev->dev, + ret =usb_control_msg (gspca_dev->dev,usb_sndctrlpipe (gspca_dev->dev,0 ),0 ,/* request */ USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 , index, gspca_dev->usb_buf,1 ,500 ); +if (ret <0 ) +PDEBUG (D_ERR ,"reg_w_page(): " +"Failed to write register to index 0x%x, " +"value 0x%x, error %i" , + index, page[index], ret); } }
linux/drivers/media/video/gspca/pac7311.c +29 -4
@@ -263,27 +263,40 @@__u8 index, const char *buffer, int len) { + int ret; +memcpy (gspca_dev->usb_buf, buffer, len); -usb_control_msg (gspca_dev->dev, + ret =usb_control_msg (gspca_dev->dev,usb_sndctrlpipe (gspca_dev->dev,0 ),1 ,/* request */ USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 ,/* value */ index, gspca_dev->usb_buf, len,500 ); +if (ret <0 ) +PDEBUG (D_ERR ,"reg_w_buf(): " +"Failed to write registers to index 0x%x, error %i" , + index, ret); }#if 0 /* not used */ static __u8 reg_r (struct gspca_dev *gspca_dev,__u8 index) { -usb_control_msg (gspca_dev->dev, +int ret; + + ret =usb_control_msg (gspca_dev->dev,usb_rcvctrlpipe (gspca_dev->dev,0 ),0 ,/* request */ USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 ,/* value */ index, gspca_dev->usb_buf,1 ,500 ); +if (ret <0 ) +PDEBUG (D_ERR ,"reg_r(): " +"Failed to read register from index 0x%x, error %i" , + index, ret); +return gspca_dev->usb_buf[0 ]; }#endif
@@ -292,13 +305,19 @@__u8 index, __u8 value) { + int ret; + gspca_dev->usb_buf[0 ] = value; -usb_control_msg (gspca_dev->dev, + ret =usb_control_msg (gspca_dev->dev,usb_sndctrlpipe (gspca_dev->dev,0 ),0 ,/* request */ USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 , index, gspca_dev->usb_buf,1 ,500 ); +if (ret <0 ) +PDEBUG (D_ERR ,"reg_w(): " +"Failed to write register to index 0x%x, value 0x%x, error %i" , + index, value, ret); } static void reg_w_seq(struct gspca_dev *gspca_dev,
@@ -315,17 +334,23 @@ const __u8 *page, int len) { int index; +int ret;for (index =0 ; index < len; index++) {if (page[index] ==SKIP )/* skip this index */ continue ; gspca_dev->usb_buf[0 ] = page[index]; -usb_control_msg (gspca_dev->dev, + ret =usb_control_msg (gspca_dev->dev,usb_sndctrlpipe (gspca_dev->dev,0 ),0 ,/* request */ USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 , index, gspca_dev->usb_buf,1 ,500 ); +if (ret <0 ) +PDEBUG (D_ERR ,"reg_w_page(): " +"Failed to write register to index 0x%x, " +"value 0x%x, error %i" , + index, page[index], ret); } }