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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
gspca
/
m5602
/
m5602_core.c
diff --git
a/drivers/media/video/gspca/m5602/m5602_core.c
b/drivers/media/video/gspca/m5602/m5602_core.c
index
ed906fe
..
b35e483
100644
(file)
--- a/
drivers/media/video/gspca/m5602/m5602_core.c
+++ b/
drivers/media/video/gspca/m5602/m5602_core.c
@@
-332,7
+332,6
@@
static int m5602_configure(struct gspca_dev *gspca_dev,
int err;
cam = &gspca_dev->cam;
int err;
cam = &gspca_dev->cam;
- cam->epaddr = M5602_ISOC_ENDPOINT_ADDR;
sd->desc = &sd_desc;
if (dump_bridge)
sd->desc = &sd_desc;
if (dump_bridge)
@@
-374,8
+373,10
@@
static struct usb_driver sd_driver = {
/* -- module insert / remove -- */
static int __init mod_m5602_init(void)
{
/* -- module insert / remove -- */
static int __init mod_m5602_init(void)
{
- if (usb_register(&sd_driver) < 0)
- return -1;
+ int ret;
+ ret = usb_register(&sd_driver);
+ if (ret < 0)
+ return ret;
PDEBUG(D_PROBE, "registered");
return 0;
}
PDEBUG(D_PROBE, "registered");
return 0;
}