Commit ba38ee8e authored by Jean-Francois Moine's avatar Jean-Francois Moine Committed by Mauro Carvalho Chehab

V4L/DVB (9710): gspca: Remove some unuseful core in main.

Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 181b704f
...@@ -1857,10 +1857,10 @@ int gspca_dev_probe(struct usb_interface *intf, ...@@ -1857,10 +1857,10 @@ int gspca_dev_probe(struct usb_interface *intf,
gspca_dev->empty_packet = -1; /* don't check the empty packets */ gspca_dev->empty_packet = -1; /* don't check the empty packets */
/* configure the subdriver and initialize the USB device */ /* configure the subdriver and initialize the USB device */
ret = gspca_dev->sd_desc->config(gspca_dev, id); ret = sd_desc->config(gspca_dev, id);
if (ret < 0) if (ret < 0)
goto out; goto out;
ret = gspca_dev->sd_desc->init(gspca_dev); ret = sd_desc->init(gspca_dev);
if (ret < 0) if (ret < 0)
goto out; goto out;
ret = gspca_set_alt0(gspca_dev); ret = gspca_set_alt0(gspca_dev);
...@@ -1874,9 +1874,8 @@ int gspca_dev_probe(struct usb_interface *intf, ...@@ -1874,9 +1874,8 @@ int gspca_dev_probe(struct usb_interface *intf,
init_waitqueue_head(&gspca_dev->wq); init_waitqueue_head(&gspca_dev->wq);
/* init video stuff */ /* init video stuff */
gspca_dev->vdev = video_device_alloc(); memcpy(&gspca_dev->vdev, &gspca_template, sizeof gspca_template);
memcpy(gspca_dev->vdev, &gspca_template, sizeof gspca_template); gspca_dev->vdev.parent = &dev->dev;
gspca_dev->vdev->parent = &dev->dev;
gspca_dev->module = module; gspca_dev->module = module;
gspca_dev->present = 1; gspca_dev->present = 1;
ret = video_register_device(&gspca_dev->vdev, ret = video_register_device(&gspca_dev->vdev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment