diff options
Diffstat (limited to 'drivers/media/video/gspca/spca505.c')
-rw-r--r-- | drivers/media/video/gspca/spca505.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c index c576eed73abe..bc9dd9034ab4 100644 --- a/drivers/media/video/gspca/spca505.c +++ b/drivers/media/video/gspca/spca505.c | |||
@@ -368,10 +368,6 @@ static const u8 spca505b_init_data[][3] = { | |||
368 | {0x08, 0x00, 0x00}, | 368 | {0x08, 0x00, 0x00}, |
369 | {0x08, 0x00, 0x01}, | 369 | {0x08, 0x00, 0x01}, |
370 | {0x08, 0x00, 0x02}, | 370 | {0x08, 0x00, 0x02}, |
371 | {0x00, 0x01, 0x00}, | ||
372 | {0x00, 0x01, 0x01}, | ||
373 | {0x00, 0x01, 0x34}, | ||
374 | {0x00, 0x01, 0x35}, | ||
375 | {0x06, 0x18, 0x08}, | 371 | {0x06, 0x18, 0x08}, |
376 | {0x06, 0xfc, 0x09}, | 372 | {0x06, 0xfc, 0x09}, |
377 | {0x06, 0xfc, 0x0a}, | 373 | {0x06, 0xfc, 0x0a}, |
@@ -582,7 +578,7 @@ static int reg_write(struct usb_device *dev, | |||
582 | PDEBUG(D_USBO, "reg write: 0x%02x,0x%02x:0x%02x, %d", | 578 | PDEBUG(D_USBO, "reg write: 0x%02x,0x%02x:0x%02x, %d", |
583 | req, index, value, ret); | 579 | req, index, value, ret); |
584 | if (ret < 0) | 580 | if (ret < 0) |
585 | PDEBUG(D_ERR, "reg write: error %d", ret); | 581 | err("reg write: error %d", ret); |
586 | return ret; | 582 | return ret; |
587 | } | 583 | } |
588 | 584 | ||
@@ -689,8 +685,7 @@ static int sd_start(struct gspca_dev *gspca_dev) | |||
689 | return ret; | 685 | return ret; |
690 | } | 686 | } |
691 | if (ret != 0x0101) { | 687 | if (ret != 0x0101) { |
692 | PDEBUG(D_ERR|D_CONF, | 688 | err("After vector read returns 0x%04x should be 0x0101", |
693 | "After vector read returns 0x%04x should be 0x0101", | ||
694 | ret); | 689 | ret); |
695 | } | 690 | } |
696 | 691 | ||
@@ -821,18 +816,11 @@ static struct usb_driver sd_driver = { | |||
821 | /* -- module insert / remove -- */ | 816 | /* -- module insert / remove -- */ |
822 | static int __init sd_mod_init(void) | 817 | static int __init sd_mod_init(void) |
823 | { | 818 | { |
824 | int ret; | 819 | return usb_register(&sd_driver); |
825 | |||
826 | ret = usb_register(&sd_driver); | ||
827 | if (ret < 0) | ||
828 | return ret; | ||
829 | PDEBUG(D_PROBE, "registered"); | ||
830 | return 0; | ||
831 | } | 820 | } |
832 | static void __exit sd_mod_exit(void) | 821 | static void __exit sd_mod_exit(void) |
833 | { | 822 | { |
834 | usb_deregister(&sd_driver); | 823 | usb_deregister(&sd_driver); |
835 | PDEBUG(D_PROBE, "deregistered"); | ||
836 | } | 824 | } |
837 | 825 | ||
838 | module_init(sd_mod_init); | 826 | module_init(sd_mod_init); |