diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 17:16:26 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 17:16:26 -0300 |
| commit | 63a0b3264ab017fbbf6ac2fcbe17393ff0afae99 (patch) | |
| tree | 8141fd182c3b3ec5b3f2ab5a4aaf6722d7f38cec /linux/drivers/media/video | |
| parent | 8aa42788bd13fff2951d3ec89d1f2af73932d278 (diff) | |
| parent | 7badc67bd1dbbce7a96802f2aba9fa94695a70d4 (diff) | |
| download | mediapointer-dvb-s2-63a0b3264ab017fbbf6ac2fcbe17393ff0afae99.tar.gz mediapointer-dvb-s2-63a0b3264ab017fbbf6ac2fcbe17393ff0afae99.tar.bz2 | |
merge: http://linuxtv.org/hg/~jfrancois/gspca/
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/gspca/gspca.c | 2 |
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; |