diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-08-27 08:22:20 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-08-27 08:22:20 +0200 |
| commit | 93bb70e0c00f1be4cc857e4d8375c44058cce71e (patch) | |
| tree | 7b6a11844e00b3f4bf8281c7a799e61494220819 /sound/pci/lx6464es/lx6464es.c | |
| parent | gma500: Fix frequency detection (diff) | |
| parent | Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-93bb70e0c00f1be4cc857e4d8375c44058cce71e.tar.xz linux-93bb70e0c00f1be4cc857e4d8375c44058cce71e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_modes.c
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; |