diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-11-22 04:27:34 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 09:38:06 -0200 |
| commit | ba38ee8ebe4a42ce2213802152b0b86a95dc109f (patch) | |
| tree | 45279e7056218173493ceafaa2a1184e2045d1c1 /drivers/media | |
| parent | 181b704fd3e32cdf779bc4d5b99d43a4b2c25985 (diff) | |
| download | linux-ba38ee8ebe4a42ce2213802152b0b86a95dc109f.tar.gz linux-ba38ee8ebe4a42ce2213802152b0b86a95dc109f.tar.bz2 linux-ba38ee8ebe4a42ce2213802152b0b86a95dc109f.zip | |
V4L/DVB (9710): gspca: Remove some unuseful core in main.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/gspca/gspca.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index e77cc19be4ec..2358e6cfb381 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@ -1857,10 +1857,10 @@ int gspca_dev_probe(struct usb_interface *intf, gspca_dev->empty_packet = -1; /* don't check the empty packets */ /* 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) goto out; - ret = gspca_dev->sd_desc->init(gspca_dev); + ret = sd_desc->init(gspca_dev); if (ret < 0) goto out; ret = gspca_set_alt0(gspca_dev); @@ -1874,9 +1874,8 @@ int gspca_dev_probe(struct usb_interface *intf, init_waitqueue_head(&gspca_dev->wq); /* init video stuff */ - gspca_dev->vdev = video_device_alloc(); - memcpy(gspca_dev->vdev, &gspca_template, sizeof gspca_template); - gspca_dev->vdev->parent = &dev->dev; + memcpy(&gspca_dev->vdev, &gspca_template, sizeof gspca_template); + gspca_dev->vdev.parent = &dev->dev; gspca_dev->module = module; gspca_dev->present = 1; ret = video_register_device(&gspca_dev->vdev, |