Merge tag 'thermal-v5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/therma...

[linux-2.6-microblaze.git] / sound / ppc / beep.c

diff --git a/sound/ppc/beep.c b/sound/ppc/beep.c
index 6bc586a..0f4bce1 100644 (file)
--- a/sound/ppc/beep.c
+++ b/sound/ppc/beep.c
@@ -105,7 +105,10 @@ static int snd_pmac_beep_event(struct input_dev *dev, unsigned int type,
        }
 
        chip = input_get_drvdata(dev);
-       if (! chip || (beep = chip->beep) == NULL)
+       if (!chip)
+               return -1;
+       beep = chip->beep;
+       if (!beep)
                return -1;
 
        if (! hz) {