Merge remote-tracking branch 'ibft/master'

[karo-tx-linux.git] / sound / ppc / pmac.c

diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 3ecbd67f88c9143e31de7d4fcb38ca092d9ea758..ab96cde7417b833d6e9e14e44aea7cb91cf965ba 100644 (file)
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -881,8 +881,7 @@ static int snd_pmac_free(struct snd_pmac *chip)
                for (i = 0; i < 3; i++) {
                        if (chip->requested & (1 << i))
                                release_mem_region(chip->rsrc[i].start,
-                                                  chip->rsrc[i].end -
-                                                  chip->rsrc[i].start + 1);
+                                                  resource_size(&chip->rsrc[i]));
                }
        }
 
@@ -1228,8 +1227,7 @@ int __devinit snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
                                goto __error;
                        }
                        if (request_mem_region(chip->rsrc[i].start,
-                                              chip->rsrc[i].end -
-                                              chip->rsrc[i].start + 1,
+                                              resource_size(&chip->rsrc[i]),
                                               rnames[i]) == NULL) {
                                printk(KERN_ERR "snd: can't request rsrc "
                                       " %d (%s: %pR)\n",
@@ -1254,8 +1252,7 @@ int __devinit snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
                                goto __error;
                        }
                        if (request_mem_region(chip->rsrc[i].start,
-                                              chip->rsrc[i].end -
-                                              chip->rsrc[i].start + 1,
+                                              resource_size(&chip->rsrc[i]),
                                               rnames[i]) == NULL) {
                                printk(KERN_ERR "snd: can't request rsrc "
                                       " %d (%s: %pR)\n",