diff options
| author | Patrick Boettcher <pb@linuxtv.org> | 2008-12-10 22:28:25 +0100 |
|---|---|---|
| committer | Patrick Boettcher <pb@linuxtv.org> | 2008-12-10 22:28:25 +0100 |
| commit | a9efe23fbe1000bff6e24012a5b580f9a8b93a92 (patch) | |
| tree | 0308e2214bcc86e348e5d731d6bf958f1d4bf54f /linux/drivers/media/video/cx88 | |
| parent | 12583b9f4af4d04cce76742c9859bff4068e6345 (diff) | |
| parent | 97b478e31ccddc358a73628542bb2d32983abeac (diff) | |
| download | mediapointer-dvb-s2-a9efe23fbe1000bff6e24012a5b580f9a8b93a92.tar.gz mediapointer-dvb-s2-a9efe23fbe1000bff6e24012a5b580f9a8b93a92.tar.bz2 | |
sync from main
From: Patrick Boettcher <pb@linuxtv.org>
sync from main
Priority: normal
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video/cx88')
| -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) |