diff --git a/[refs] b/[refs] index a225b206e9b5..b8fa378605c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b57e3c2692b04ac0b2f14bb94c63291fad1d7309 +refs/heads/master: 27810c5e7f8f2ddf036c16b5e40fd22abdc041f9 diff --git a/trunk/drivers/gpio/gpio-vr41xx.c b/trunk/drivers/gpio/gpio-vr41xx.c index a365be040b36..98723cb9ac68 100644 --- a/trunk/drivers/gpio/gpio-vr41xx.c +++ b/trunk/drivers/gpio/gpio-vr41xx.c @@ -518,7 +518,7 @@ static int __devinit giu_probe(struct platform_device *pdev) if (!res) return -EBUSY; - giu_base = ioremap(res->start, res->end - res->start + 1); + giu_base = ioremap(res->start, resource_size(res)); if (!giu_base) return -ENOMEM;