From af22f9a7b3115100dc7985581f40cd4a2bfd6e66 Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Fri, 20 Jan 2006 14:44:41 +0100 Subject: [PATCH] --- yaml --- r: 19566 b: refs/heads/master c: 168a95f170070ddda1ba7505c2ce9ae8b50f21f6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/ppc/pmac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 504e30a813df..d13152e459d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20cd22620ad3a8a57a942fa1f301d47a1e15d67e +refs/heads/master: 168a95f170070ddda1ba7505c2ce9ae8b50f21f6 diff --git a/trunk/sound/ppc/pmac.c b/trunk/sound/ppc/pmac.c index a642e4cfcf45..4988f873a7ba 100644 --- a/trunk/sound/ppc/pmac.c +++ b/trunk/sound/ppc/pmac.c @@ -1216,7 +1216,7 @@ int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return) goto __error; } for (i = 0; i < 3; i ++) { - if (of_address_to_resource(np->parent, i, + if (of_address_to_resource(np, i, &chip->rsrc[i])) { printk(KERN_ERR "snd: can't translate rsrc " " %d (%s)\n", i, rnames[i]);