1 files changed, 5 insertions, 1 deletions

diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 3b7471c344b4..696280c3c05a 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -1137,7 +1137,8 @@ static long tumbler_find_device(const char *device, const char *platform,
                 gp->inactive_val = (*base) ? 0x4 : 0x5;
         } else {
                 const u32 *prop = NULL;
-                gp->active_state = IS_G4DA && !strcmp(device, "keywest-gpio15");
+                gp->active_state = IS_G4DA
+                                && !strncmp(device, "keywest-gpio1", 13);
                 gp->active_val = 0x4;
                 gp->inactive_val = 0x5;
                 /* Here are some crude hacks to extract the GPIO polarity and
@@ -1315,6 +1316,9 @@ static int __devinit tumbler_init(struct snd_pmac *chip)
         if (irq <= NO_IRQ)
                 irq = tumbler_find_device("line-output-detect",
                                           NULL, &mix->line_detect, 1);
+        if (IS_G4DA && irq <= NO_IRQ)
+                irq = tumbler_find_device("keywest-gpio16",
+                                          NULL, &mix->line_detect, 1);
         mix->lineout_irq = irq;
 
         tumbler_reset_audio(chip);