aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/finepix.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/gspca/finepix.c')
-rw-r--r--drivers/media/video/gspca/finepix.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/video/gspca/finepix.c
index 5d90e7448579..d78226455d1f 100644
--- a/drivers/media/video/gspca/finepix.c
+++ b/drivers/media/video/gspca/finepix.c
@@ -182,7 +182,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
182 /* Init the device */ 182 /* Init the device */
183 ret = command(gspca_dev, 0); 183 ret = command(gspca_dev, 0);
184 if (ret < 0) { 184 if (ret < 0) {
185 PDEBUG(D_STREAM, "init failed %d", ret); 185 err("init failed %d", ret);
186 return ret; 186 return ret;
187 } 187 }
188 188
@@ -194,14 +194,14 @@ static int sd_start(struct gspca_dev *gspca_dev)
194 FPIX_MAX_TRANSFER, &len, 194 FPIX_MAX_TRANSFER, &len,
195 FPIX_TIMEOUT); 195 FPIX_TIMEOUT);
196 if (ret < 0) { 196 if (ret < 0) {
197 PDEBUG(D_STREAM, "usb_bulk_msg failed %d", ret); 197 err("usb_bulk_msg failed %d", ret);
198 return ret; 198 return ret;
199 } 199 }
200 200
201 /* Request a frame, but don't read it */ 201 /* Request a frame, but don't read it */
202 ret = command(gspca_dev, 1); 202 ret = command(gspca_dev, 1);
203 if (ret < 0) { 203 if (ret < 0) {
204 PDEBUG(D_STREAM, "frame request failed %d", ret); 204 err("frame request failed %d", ret);
205 return ret; 205 return ret;
206 } 206 }
207 207
@@ -291,19 +291,12 @@ static struct usb_driver sd_driver = {
291/* -- module insert / remove -- */ 291/* -- module insert / remove -- */
292static int __init sd_mod_init(void) 292static int __init sd_mod_init(void)
293{ 293{
294 int ret; 294 return usb_register(&sd_driver);
295
296 ret = usb_register(&sd_driver);
297 if (ret < 0)
298 return ret;
299 PDEBUG(D_PROBE, "registered");
300 return 0;
301} 295}
302 296
303static void __exit sd_mod_exit(void) 297static void __exit sd_mod_exit(void)
304{ 298{
305 usb_deregister(&sd_driver); 299 usb_deregister(&sd_driver);
306 PDEBUG(D_PROBE, "deregistered");
307} 300}
308 301
309module_init(sd_mod_init); 302module_init(sd_mod_init);