diff options
| author | Erik Andrén <erik.andren@gmail.com> | 2008-12-26 11:58:34 +0100 |
|---|---|---|
| committer | Erik Andrén <erik.andren@gmail.com> | 2008-12-26 11:58:34 +0100 |
| commit | da1d0789d659be9f1d2568351f2b9f3d81345aed (patch) | |
| tree | 71e1067d4024c066f1b7b651205a9cbc222691da /linux/drivers/media/video/cx88/cx88-alsa.c | |
| parent | cbd16cf5e7e4aae60ca283ad27bafae1fcb21102 (diff) | |
| parent | ac2c9fd519acfcea10f4b1b17b69e9f3d8f49555 (diff) | |
| download | mediapointer-dvb-s2-da1d0789d659be9f1d2568351f2b9f3d81345aed.tar.gz mediapointer-dvb-s2-da1d0789d659be9f1d2568351f2b9f3d81345aed.tar.bz2 | |
Merge with the main gspca tree.
From: Erik Andrén <erik.andren@gmail.com>
Priority: normal
Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-alsa.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-alsa.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-alsa.c b/linux/drivers/media/video/cx88/cx88-alsa.c index 3dd2f6629..f7171586d 100644 --- a/linux/drivers/media/video/cx88/cx88-alsa.c +++ b/linux/drivers/media/video/cx88/cx88-alsa.c @@ -795,7 +795,6 @@ static int __devinit snd_cx88_create(struct snd_card *card, core = cx88_core_get(pci); if (NULL == core) { err = -EINVAL; - kfree (chip); return err; } @@ -872,7 +871,7 @@ static int __devinit cx88_audio_initdev(struct pci_dev *pci, err = snd_cx88_create(card, pci, &chip); if (err < 0) - return (err); + goto error; err = snd_cx88_pcm(chip, 0, "CX88 Digital"); if (err < 0) |