diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-07-01 08:34:15 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-07-01 08:34:15 +0200 |
| commit | 498386d1c4d98a72db7a2f51473593ad563b45ae (patch) | |
| tree | f94e6b211b9a50106e6e047cd992ae3e209ef007 /sound/parisc/harmony.c | |
| parent | 5c6d4f97267f02f47acea8a652265348ec12de51 (diff) | |
| parent | dfc2e8ae4066a95c7f9c2bb2dfa26651feaa6b83 (diff) | |
| download | lwn-498386d1c4d98a72db7a2f51473593ad563b45ae.tar.gz lwn-498386d1c4d98a72db7a2f51473593ad563b45ae.zip | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/parisc/harmony.c')
| -rw-r--r-- | sound/parisc/harmony.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c index f2ca0a701987..1440db8b4177 100644 --- a/sound/parisc/harmony.c +++ b/sound/parisc/harmony.c @@ -915,10 +915,9 @@ snd_harmony_create(struct snd_card *card, spin_lock_init(&h->mixer_lock); spin_lock_init(&h->lock); - if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, - h, &ops)) < 0) { - goto free_and_ret; - } + err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, h, &ops); + if (err < 0) + goto free_and_ret; *rchip = h; |