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 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
gspca
/
finepix.c
diff --git
a/drivers/media/video/gspca/finepix.c
b/drivers/media/video/gspca/finepix.c
index
5d90e74
..
d782264
100644
(file)
--- 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)
/* Init the device */
ret = command(gspca_dev, 0);
if (ret < 0) {
/* Init the device */
ret = command(gspca_dev, 0);
if (ret < 0) {
-
PDEBUG(D_STREAM,
"init failed %d", ret);
+
err(
"init failed %d", ret);
return ret;
}
return ret;
}
@@
-194,14
+194,14
@@
static int sd_start(struct gspca_dev *gspca_dev)
FPIX_MAX_TRANSFER, &len,
FPIX_TIMEOUT);
if (ret < 0) {
FPIX_MAX_TRANSFER, &len,
FPIX_TIMEOUT);
if (ret < 0) {
-
PDEBUG(D_STREAM,
"usb_bulk_msg failed %d", ret);
+
err(
"usb_bulk_msg failed %d", ret);
return ret;
}
/* Request a frame, but don't read it */
ret = command(gspca_dev, 1);
if (ret < 0) {
return ret;
}
/* Request a frame, but don't read it */
ret = command(gspca_dev, 1);
if (ret < 0) {
-
PDEBUG(D_STREAM,
"frame request failed %d", ret);
+
err(
"frame request failed %d", ret);
return ret;
}
return ret;
}
@@
-291,19
+291,12
@@
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);