Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[linux-2.6-microblaze.git] / sound / parisc / harmony.c

diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index f2ca0a7..1440db8 100644 (file)
--- 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;