X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=sound%2Fppc%2Fbeep.c;h=0f4bce1c0d4f7a4941f56d32981ada41873e23f4;hb=f7ea4be434fe7ea38699d14c1192481899e6ac94;hp=6bc586a5db0f221de52a79e78671472d3bda98d4;hpb=e129940938d84d8b71074e40a9cc4f69278eb1e1;p=linux-2.6-microblaze.git

diff --git a/sound/ppc/beep.c b/sound/ppc/beep.c
index 6bc586a5db0f..0f4bce1c0d4f 100644
--- 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) {