diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-08-20 22:14:26 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-08-20 22:14:26 +0200 |
| commit | ddf83485d7da468251716b8040bac1280622181e (patch) | |
| tree | d28e9b511dedcfed447577f4bb49a99b244a9430 /sound/pci/ctxfi | |
| parent | 099d53c308f50e8ee5b6638ec3f40f0104b3ee31 (diff) | |
| parent | 535b6c51fe8293c88ce919cdfc4390c67a1cb6d1 (diff) | |
| download | linux-3.10-ddf83485d7da468251716b8040bac1280622181e.tar.gz linux-3.10-ddf83485d7da468251716b8040bac1280622181e.tar.bz2 linux-3.10-ddf83485d7da468251716b8040bac1280622181e.zip | |
Merge branch 'for-linus' into for-next
Conflicts:
sound/pci/hda/hda_codec.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ctxfi')
| -rw-r--r-- | sound/pci/ctxfi/ctatc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c index 58b235c46e8..a2f997a9977 100644 --- a/sound/pci/ctxfi/ctatc.c +++ b/sound/pci/ctxfi/ctatc.c @@ -1725,8 +1725,10 @@ int __devinit ct_atc_create(struct snd_card *card, struct pci_dev *pci, atc_connect_resources(atc); atc->timer = ct_timer_new(atc); - if (!atc->timer) + if (!atc->timer) { + err = -ENOMEM; goto error1; + } err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, atc, &ops); if (err < 0) |