git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
gspca
/
t613.c
diff --git
a/drivers/media/video/gspca/t613.c
b/drivers/media/video/gspca/t613.c
index
3b3b983
..
b45f4d0
100644
(file)
--- a/
drivers/media/video/gspca/t613.c
+++ b/
drivers/media/video/gspca/t613.c
@@
-892,7
+892,7
@@
static int sd_init(struct gspca_dev *gspca_dev)
sd->sensor = SENSOR_OM6802;
break;
default:
sd->sensor = SENSOR_OM6802;
break;
default:
-
PDEBUG(D_ERR|D_PROBE,
"unknown sensor %04x", sensor_id);
+
err(
"unknown sensor %04x", sensor_id);
return -EINVAL;
}
return -EINVAL;
}
@@
-1444,17
+1444,11
@@
static struct usb_driver sd_driver = {
/* -- module insert / remove -- */
static int __init sd_mod_init(void)
{
/* -- 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);
}
static void __exit sd_mod_exit(void)
{
usb_deregister(&sd_driver);
- PDEBUG(D_PROBE, "deregistered");
}
module_init(sd_mod_init);
}
module_init(sd_mod_init);