diff options
Diffstat (limited to 'drivers/media/video/gspca/gl860/gl860.c')
-rw-r--r-- | drivers/media/video/gspca/gl860/gl860.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/media/video/gspca/gl860/gl860.c b/drivers/media/video/gspca/gl860/gl860.c index 99083038cec3..e8e071aa212f 100644 --- a/drivers/media/video/gspca/gl860/gl860.c +++ b/drivers/media/video/gspca/gl860/gl860.c | |||
@@ -499,21 +499,8 @@ MODULE_DEVICE_TABLE(usb, device_table); | |||
499 | static int sd_probe(struct usb_interface *intf, | 499 | static int sd_probe(struct usb_interface *intf, |
500 | const struct usb_device_id *id) | 500 | const struct usb_device_id *id) |
501 | { | 501 | { |
502 | struct gspca_dev *gspca_dev; | 502 | return gspca_dev_probe(intf, id, |
503 | s32 ret; | ||
504 | |||
505 | ret = gspca_dev_probe(intf, id, | ||
506 | &sd_desc_mi1320, sizeof(struct sd), THIS_MODULE); | 503 | &sd_desc_mi1320, sizeof(struct sd), THIS_MODULE); |
507 | |||
508 | if (ret >= 0) { | ||
509 | gspca_dev = usb_get_intfdata(intf); | ||
510 | |||
511 | PDEBUG(D_PROBE, | ||
512 | "Camera is now controlling video device %s", | ||
513 | video_device_node_name(&gspca_dev->vdev)); | ||
514 | } | ||
515 | |||
516 | return ret; | ||
517 | } | 504 | } |
518 | 505 | ||
519 | static void sd_disconnect(struct usb_interface *intf) | 506 | static void sd_disconnect(struct usb_interface *intf) |