Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[pandora-kernel.git] / drivers / media / video / gspca / spca501.c

diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c
index c993339..642839a 100644 (file)
--- a/drivers/media/video/gspca/spca501.c
+++ b/drivers/media/video/gspca/spca501.c
@@ -1724,7 +1724,7 @@ static const __u16 spca501c_mysterious_init_data[][3] = {
        {0x00, 0x0000, 0x0048},
        {0x00, 0x0000, 0x0049},
        {0x00, 0x0008, 0x004a},
-/* DSP Registers        */
+/* DSP Registers       */
        {0x01, 0x00a6, 0x0000},
        {0x01, 0x0028, 0x0001},
        {0x01, 0x0000, 0x0002},
@@ -1788,7 +1788,7 @@ static const __u16 spca501c_mysterious_init_data[][3] = {
        {0x05, 0x0022, 0x0004},
        {0x05, 0x0025, 0x0001},
        {0x05, 0x0000, 0x0000},
-/* Part 4             */
+/* Part 4 */
        {0x05, 0x0026, 0x0001},
        {0x05, 0x0001, 0x0000},
        {0x05, 0x0027, 0x0001},
@@ -1806,7 +1806,7 @@ static const __u16 spca501c_mysterious_init_data[][3] = {
        {0x05, 0x0001, 0x0000},
        {0x05, 0x0027, 0x0001},
        {0x05, 0x004e, 0x0000},
-/* Part 5               */
+/* Part 5 */
        {0x01, 0x0003, 0x003f},
        {0x01, 0x0001, 0x0056},
        {0x01, 0x000f, 0x0008},
@@ -1852,7 +1852,7 @@ static int reg_write(struct usb_device *dev,
        PDEBUG(D_USBO, "reg write: 0x%02x 0x%02x 0x%02x",
                req, index, value);
        if (ret < 0)
-               PDEBUG(D_ERR, "reg write: error %d", ret);
+               err("reg write: error %d", ret);
        return ret;
 }
 
@@ -2189,17 +2189,11 @@ static struct usb_driver sd_driver = {
 /* -- module insert / remove -- */
 static int __init sd_mod_init(void)
 {
-       int ret;
-       ret = usb_register(&sd_driver);
-       if (ret < 0)
-               return ret;
-       PDEBUG(D_PROBE, "registered");
-       return 0;
+       return usb_register(&sd_driver);
 }
 static void __exit sd_mod_exit(void)
 {
        usb_deregister(&sd_driver);
-       PDEBUG(D_PROBE, "deregistered");
 }
 
 module_init(sd_mod_init);