Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / media / video / gspca / gl860 / gl860.c

diff --git a/drivers/media/video/gspca/gl860/gl860.c b/drivers/media/video/gspca/gl860/gl860.c
index e86eb8b4aedc47eb7dbeb24e132a0656e47ebf54..b05bec7321b5d94df6a93efff96db96f053405da 100644 (file)
--- a/drivers/media/video/gspca/gl860/gl860.c
+++ b/drivers/media/video/gspca/gl860/gl860.c
@@ -540,15 +540,12 @@ static int __init sd_mod_init(void)
 
        if (usb_register(&sd_driver) < 0)
                return -1;
-       PDEBUG(D_PROBE, "driver registered");
-
        return 0;
 }
 
 static void __exit sd_mod_exit(void)
 {
        usb_deregister(&sd_driver);
-       PDEBUG(D_PROBE, "driver deregistered");
 }
 
 module_init(sd_mod_init);
@@ -588,8 +585,7 @@ int gl860_RTx(struct gspca_dev *gspca_dev,
        }
 
        if (r < 0)
-               PDEBUG(D_ERR,
-                       "ctrl transfer failed %4d "
+               err("ctrl transfer failed %4d "
                        "[p%02x r%d v%04x i%04x len%d]",
                        r, pref, req, val, index, len);
        else if (len > 1 && r < len)