From 42b11168a7430fccbbbe3417a75a7e861eb35ed5 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 1 Sep 2006 17:15:36 +0200 Subject: [PATCH] --- yaml --- r: 34932 b: refs/heads/master c: 2fd53a7e9b1392f9cc3002a24f3c13b2796e70c3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/ppc/tumbler.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 43dde56e968f..2daa2872efae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 927fc866025857c109219d4ed62d8c3cbc02713a +refs/heads/master: 2fd53a7e9b1392f9cc3002a24f3c13b2796e70c3 diff --git a/trunk/sound/ppc/tumbler.c b/trunk/sound/ppc/tumbler.c index 6ae2d5b9aa4a..cdff53e4a17e 100644 --- a/trunk/sound/ppc/tumbler.c +++ b/trunk/sound/ppc/tumbler.c @@ -190,7 +190,7 @@ static int check_audio_gpio(struct pmac_gpio *gp) ret = do_gpio_read(gp); - return (ret & 0xd) == (gp->active_val & 0xd); + return (ret & 0x1) == (gp->active_val & 0x1); } static int read_audio_gpio(struct pmac_gpio *gp) @@ -198,7 +198,8 @@ static int read_audio_gpio(struct pmac_gpio *gp) int ret; if (! gp->addr) return 0; - ret = ((do_gpio_read(gp) & 0x02) !=0); + ret = do_gpio_read(gp); + ret = (ret & 0x02) !=0; return ret == gp->active_state; }