diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-05-01 10:31:12 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-14 02:54:09 -0300 |
| commit | 3f98387efa9333c5765d36e144c47c107d6ba64a (patch) | |
| tree | b5c8f515aecf306b0e0b6087458d221d9411f6cb /drivers/media/video/cx18/cx18-driver.c | |
| parent | 6a4a79355bfa9ae6977556595a68f2e3a0e143f7 (diff) | |
| download | op-kernel-dev-3f98387efa9333c5765d36e144c47c107d6ba64a.zip op-kernel-dev-3f98387efa9333c5765d36e144c47c107d6ba64a.tar.gz | |
V4L/DVB (7854): cx18/ivtv: improve and fix out-of-memory handling
- don't show kernel backtrace when the allocation of the buffers fails: the
normal ivtv/cx18 messages are clear enough and the backtrace scares users.
- fix cleanup after the buffer allocation fails (caused kernel panic).
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx18/cx18-driver.c')
| -rw-r--r-- | drivers/media/video/cx18/cx18-driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c index 7813380..9453223 100644 --- a/drivers/media/video/cx18/cx18-driver.c +++ b/drivers/media/video/cx18/cx18-driver.c @@ -805,7 +805,7 @@ static int __devinit cx18_probe(struct pci_dev *dev, return 0; free_streams: - cx18_streams_cleanup(cx); + cx18_streams_cleanup(cx, 1); free_irq: free_irq(cx->dev->irq, (void *)cx); free_i2c: @@ -908,7 +908,7 @@ static void cx18_remove(struct pci_dev *pci_dev) cx18_halt_firmware(cx); - cx18_streams_cleanup(cx); + cx18_streams_cleanup(cx, 1); exit_cx18_i2c(cx); |
