From 58ac40d696008d9ac6fb933240c14e73cdf7de10 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Tue, 2 Dec 2008 19:34:52 -0300 Subject: [PATCH] --- yaml --- r: 124323 b: refs/heads/master c: a8782f669c35df585749caadfbae6456d9e3ac98 h: refs/heads/master i: 124321: 7a0d63e64147fc60f798d2614f83ea48ad9c5447 124319: 5e14457705a36d28b14a76261f89918ca806003d v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx88/cx88-alsa.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dbb2786e4e92..fb19e6294c85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bb1b7e879091f09fc677dca10c5e132b68a9da3 +refs/heads/master: a8782f669c35df585749caadfbae6456d9e3ac98 diff --git a/trunk/drivers/media/video/cx88/cx88-alsa.c b/trunk/drivers/media/video/cx88/cx88-alsa.c index 06f171ab6149..66c755c116dc 100644 --- a/trunk/drivers/media/video/cx88/cx88-alsa.c +++ b/trunk/drivers/media/video/cx88/cx88-alsa.c @@ -742,7 +742,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; } @@ -812,7 +811,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)