summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/gspca/gspca.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 17:56:15 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 17:56:15 -0300
commitcdc52d7eea48a1afe4d9d701bd37d0867568d380 (patch)
tree882a959e8f08e9e81f7bd16c7ec85f6366e8b45f /linux/drivers/media/video/gspca/gspca.c
parent89e2fea073c15a3f72ec74c3859e7a3b271e7db3 (diff)
parent63a0b3264ab017fbbf6ac2fcbe17393ff0afae99 (diff)
downloadmediapointer-dvb-s2-cdc52d7eea48a1afe4d9d701bd37d0867568d380.tar.gz
mediapointer-dvb-s2-cdc52d7eea48a1afe4d9d701bd37d0867568d380.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/gspca/gspca.c')
-rw-r--r--linux/drivers/media/video/gspca/gspca.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/gspca/gspca.c b/linux/drivers/media/video/gspca/gspca.c
index 3c4ce567f..ffa2d7de0 100644
--- a/linux/drivers/media/video/gspca/gspca.c
+++ b/linux/drivers/media/video/gspca/gspca.c
@@ -1765,6 +1765,7 @@ int gspca_dev_probe(struct usb_interface *intf,
memcpy(&gspca_dev->fops, &dev_fops, sizeof gspca_dev->fops);
gspca_dev->vdev.fops = &gspca_dev->fops;
gspca_dev->fops.owner = module; /* module protection */
+ gspca_dev->present = 1;
ret = video_register_device(&gspca_dev->vdev,
VFL_TYPE_GRABBER,
video_nr);
@@ -1773,7 +1774,6 @@ int gspca_dev_probe(struct usb_interface *intf,
goto out;
}
- gspca_dev->present = 1;
usb_set_intfdata(intf, gspca_dev);
PDEBUG(D_PROBE, "probe ok");
return 0;