diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-10-09 15:40:19 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-10-09 15:40:19 -0300 |
commit | c783703287243700667bd60092fdfbade0e15491 (patch) | |
tree | e190b095e4a34476e78b47a37ce4d0f58e04422e /linux/drivers/media/video/cx88 | |
parent | 186ae6cf1d76cbcf4a538b31f262efb249f758d5 (diff) | |
parent | 2e5aadf663db9a0ec727cf0ff3429f299fe7cc14 (diff) | |
download | mediapointer-dvb-s2-c783703287243700667bd60092fdfbade0e15491.tar.gz mediapointer-dvb-s2-c783703287243700667bd60092fdfbade0e15491.tar.bz2 |
merge: http://www.linuxtv.org/hg/~stoth/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/cx88')
-rw-r--r-- | linux/drivers/media/video/cx88/cx88-mpeg.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index f2afc1cdc..dd5fd1b64 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -703,7 +703,6 @@ int cx8802_register_driver(struct cx8802_driver *drv) } list_for_each(list,&cx8802_devlist) { - i++; h = list_entry(list, struct cx8802_dev, devlist); printk(KERN_INFO "CORE %s: subsystem: %04x:%04x, board: %s [card=%d]\n", @@ -726,6 +725,7 @@ int cx8802_register_driver(struct cx8802_driver *drv) err = drv->probe(driver); if (err == 0) { + i++; mutex_lock(&drv->core->lock); list_add_tail(&driver->devlist,&h->drvlist.devlist); mutex_unlock(&drv->core->lock); @@ -736,6 +736,8 @@ int cx8802_register_driver(struct cx8802_driver *drv) } if (i == 0) err = -ENODEV; + else + err = 0; return err; } |