diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-14 01:48:32 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-14 01:48:32 -0200 |
| commit | bbd19a63e263ada2839794825969bb63cb93e791 (patch) | |
| tree | 9e077a613643cf6d9d5efbd9cd1d139e983449d5 /linux/drivers/media/video/ivtv/ivtv-driver.c | |
| parent | 6ca32bcb38555ee72127c83701a6b530e4793857 (diff) | |
| parent | dd4ed80e157d22985ed9b47367e62a11c3dd4edd (diff) | |
| download | mediapointer-dvb-s2-bbd19a63e263ada2839794825969bb63cb93e791.tar.gz mediapointer-dvb-s2-bbd19a63e263ada2839794825969bb63cb93e791.tar.bz2 | |
merge: http://linuxtv.org/hg/~pb/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-driver.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-driver.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.c b/linux/drivers/media/video/ivtv/ivtv-driver.c index b712c29e7..05bba3928 100644 --- a/linux/drivers/media/video/ivtv/ivtv-driver.c +++ b/linux/drivers/media/video/ivtv/ivtv-driver.c @@ -953,8 +953,10 @@ static int __devinit ivtv_probe(struct pci_dev *dev, itv->instance = atomic_inc_return(&ivtv_instance) - 1; retval = v4l2_device_register(&dev->dev, &itv->device); - if (retval) + if (retval) { + kfree(itv); return retval; + } /* "ivtv + PCI ID" is a bit of a mouthful, so use "ivtv + instance" instead. */ snprintf(itv->device.name, sizeof(itv->device.name), |