diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-26 12:06:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-26 12:06:54 -0300 |
| commit | 2224352436462570837c39e7a12ed6f98a96986f (patch) | |
| tree | 35270051c3b3797885309d3975b897264624c822 /linux/drivers/media/video/cx18/cx18-driver.c | |
| parent | 2a273893a153bd7311b488785d4ced28ff9967c2 (diff) | |
| parent | cf2c310a0889cdeb0bc711e69833b77007717bcd (diff) | |
| download | mediapointer-dvb-s2-2224352436462570837c39e7a12ed6f98a96986f.tar.gz mediapointer-dvb-s2-2224352436462570837c39e7a12ed6f98a96986f.tar.bz2 | |
merge: http://linuxtv.org/hg/~mcisely/pvrusb2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-driver.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-driver.c b/linux/drivers/media/video/cx18/cx18-driver.c index 008745af2..d654b1d6e 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.c +++ b/linux/drivers/media/video/cx18/cx18-driver.c @@ -607,14 +607,14 @@ static int __devinit cx18_probe(struct pci_dev *dev, } cx = kzalloc(sizeof(struct cx18), GFP_ATOMIC); - if (cx == 0) { + if (!cx) { spin_unlock(&cx18_cards_lock); return -ENOMEM; } cx18_cards[cx18_cards_active] = cx; cx->dev = dev; cx->num = cx18_cards_active++; - snprintf(cx->name, sizeof(cx->name) - 1, "cx18-%d", cx->num); + snprintf(cx->name, sizeof(cx->name), "cx18-%d", cx->num); CX18_INFO("Initializing card #%d\n", cx->num); spin_unlock(&cx18_cards_lock); @@ -889,7 +889,7 @@ static void cx18_remove(struct pci_dev *pci_dev) /* Stop all captures */ CX18_DEBUG_INFO("Stopping all streams\n"); - if (atomic_read(&cx->capturing) > 0) + if (atomic_read(&cx->tot_capturing) > 0) cx18_stop_all_captures(cx); /* Interrupts */ |