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
/
jeilinj.c
diff --git
a/drivers/media/video/gspca/jeilinj.c
b/drivers/media/video/gspca/jeilinj.c
index
12d9cf4
..
a35e87b
100644
(file)
--- a/
drivers/media/video/gspca/jeilinj.c
+++ b/
drivers/media/video/gspca/jeilinj.c
@@
-82,7
+82,7
@@
static int jlj_write2(struct gspca_dev *gspca_dev, unsigned char *command)
usb_sndbulkpipe(gspca_dev->dev, 3),
gspca_dev->usb_buf, 2, NULL, 500);
if (retval < 0)
usb_sndbulkpipe(gspca_dev->dev, 3),
gspca_dev->usb_buf, 2, NULL, 500);
if (retval < 0)
-
PDEBUG(D_ERR,
"command write [%02x] error %d",
+
err(
"command write [%02x] error %d",
gspca_dev->usb_buf[0], retval);
return retval;
}
gspca_dev->usb_buf[0], retval);
return retval;
}
@@
-97,7
+97,7
@@
static int jlj_read1(struct gspca_dev *gspca_dev, unsigned char response)
gspca_dev->usb_buf, 1, NULL, 500);
response = gspca_dev->usb_buf[0];
if (retval < 0)
gspca_dev->usb_buf, 1, NULL, 500);
response = gspca_dev->usb_buf[0];
if (retval < 0)
-
PDEBUG(D_ERR,
"read command [%02x] error %d",
+
err(
"read command [%02x] error %d",
gspca_dev->usb_buf[0], retval);
return retval;
}
gspca_dev->usb_buf[0], retval);
return retval;
}
@@
-191,7
+191,7
@@
static void jlj_dostream(struct work_struct *work)
buffer = kmalloc(JEILINJ_MAX_TRANSFER, GFP_KERNEL | GFP_DMA);
if (!buffer) {
buffer = kmalloc(JEILINJ_MAX_TRANSFER, GFP_KERNEL | GFP_DMA);
if (!buffer) {
-
PDEBUG(D_ERR,
"Couldn't allocate USB buffer");
+
err(
"Couldn't allocate USB buffer");
goto quit_stream;
}
while (gspca_dev->present && gspca_dev->streaming) {
goto quit_stream;
}
while (gspca_dev->present && gspca_dev->streaming) {
@@
-354,19
+354,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);