diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-05-01 12:31:12 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-05-01 12:31:12 +0200 |
| commit | ea036ab76194bc4f02dbb0803e4d977044636188 (patch) | |
| tree | 1902d1b83ee3a302c5fdfec4de2ae8e2d1506ac8 /linux/drivers/media/video/cx18/cx18-driver.c | |
| parent | 778ea1f1dd0cb7da18e5e0258f9c443f8debafe4 (diff) | |
| download | mediapointer-dvb-s2-ea036ab76194bc4f02dbb0803e4d977044636188.tar.gz mediapointer-dvb-s2-ea036ab76194bc4f02dbb0803e4d977044636188.tar.bz2 | |
cx18/ivtv: improve and fix out-of-memory handling
From: Hans Verkuil <hverkuil@xs4all.nl>
- 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>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-driver.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-driver.c b/linux/drivers/media/video/cx18/cx18-driver.c index 421e005d0..4920923f2 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.c +++ b/linux/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); |