diff --git a/[refs] b/[refs] index bc824c41d91b..d3a90c22b870 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cd684551124e71630ab96d238747051463f5b56 +refs/heads/master: 88356e908521a84b2220c9e8850d1a356a851aa9 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]);