diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-27 18:13:33 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-27 18:13:33 +0400 |
| commit | e372dc6c62bf0246a07f3291a26c562cc8659fbd (patch) | |
| tree | c7039c1d1005b80e427761ba768d7697ae4a0b72 /sound/pci/lx6464es/lx6464es.c | |
| parent | 5d4121c04b3577e37e389b3553d442f44bb346d7 (diff) | |
| parent | fea7a08acb13524b47711625eebea40a0ede69a0 (diff) | |
| download | linux-e372dc6c62bf0246a07f3291a26c562cc8659fbd.tar.xz | |
Merge 3.6-rc3 into tty-next
This picks up all of the different fixes in Linus's tree that we also need here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/pci/lx6464es/lx6464es.c')
| -rw-r--r-- | sound/pci/lx6464es/lx6464es.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c index d1ab43706735..5579b08bb35b 100644 --- a/sound/pci/lx6464es/lx6464es.c +++ b/sound/pci/lx6464es/lx6464es.c @@ -851,6 +851,8 @@ static int __devinit lx_pcm_create(struct lx6464es *chip) /* hardcoded device name & channel count */ err = snd_pcm_new(chip->card, (char *)card_name, 0, 1, 1, &pcm); + if (err < 0) + return err; pcm->private_data = chip; |