1 files changed, 4 insertions, 4 deletions

diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 70e4ebc70260..692c61177678 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -1121,7 +1121,7 @@ static long tumbler_find_device(const char *device, const char *platform,
         DBG("(I) GPIO device %s found, offset: %x, active state: %d !\n",
             device, gp->addr, gp->active_state);
 
-        return (node->n_intrs > 0) ? node->intrs[0].line : 0;
+        return irq_of_parse_and_map(node, 0);
 }
 
 /* reset audio */
@@ -1264,16 +1264,16 @@ static int __init tumbler_init(struct snd_pmac *chip)
                                     &mix->line_mute, 1);
         irq = tumbler_find_device("headphone-detect",
                                   NULL, &mix->hp_detect, 0);
-        if (irq < 0)
+        if (irq <= NO_IRQ)
                 irq = tumbler_find_device("headphone-detect",
                                           NULL, &mix->hp_detect, 1);
-        if (irq < 0)
+        if (irq <= NO_IRQ)
                 irq = tumbler_find_device("keywest-gpio15",
                                           NULL, &mix->hp_detect, 1);
         mix->headphone_irq = irq;
         irq = tumbler_find_device("line-output-detect",
                                   NULL, &mix->line_detect, 0);
-        if (irq < 0)
+        if (irq <= NO_IRQ)
                 irq = tumbler_find_device("line-output-detect",
                                           NULL, &mix->line_detect, 1);
         mix->lineout_irq = irq;