diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-22 22:13:05 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-22 22:13:05 +0200 |
| commit | de63d41304f966114dbdba5102c7b122e01569c3 (patch) | |
| tree | 326025e7e59c83c59e636d3d495c69c9a9561376 | |
| parent | 7d847adb75c84d8e7baddd39beda3f6587632eb6 (diff) | |
| download | mediapointer-dvb-s2-de63d41304f966114dbdba5102c7b122e01569c3.tar.gz mediapointer-dvb-s2-de63d41304f966114dbdba5102c7b122e01569c3.tar.bz2 | |
V4L: fix return value of meye probe callback
From: Henrik Kretzschmar <henne@nachtwindheim.de>
The return vaule of the probe function should return -ENOMEM instead
of -EBUSY if video_device_alloc() fails.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/meye.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/meye.c b/linux/drivers/media/video/meye.c index a0cdae0c1..afa92ea06 100644 --- a/linux/drivers/media/video/meye.c +++ b/linux/drivers/media/video/meye.c @@ -1784,6 +1784,7 @@ static int __devinit meye_probe(struct pci_dev *pcidev, goto outnotdev; } + ret = -ENOMEM; meye.mchip_dev = pcidev; meye.video_dev = video_device_alloc(); if (!meye.video_dev) { @@ -1791,7 +1792,6 @@ static int __devinit meye_probe(struct pci_dev *pcidev, goto outnotdev; } - ret = -ENOMEM; meye.grab_temp = vmalloc(MCHIP_NB_PAGES_MJPEG * PAGE_SIZE); if (!meye.grab_temp) { printk(KERN_ERR "meye: grab buffer allocation failed\n"); |