From 43c151c5664751973323d674865484e83bf9d979 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 10 Dec 2009 20:03:10 -0500 Subject: [PATCH] --- yaml --- r: 178078 b: refs/heads/master c: 4716eaf20f37d10fd01b0fcacb3e41c1abd362c3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_octeon_cf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 94ded298ff14..2308c353db25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0cdd6eb7e08fc39e9c906cc46b6ee9095c3077a9 +refs/heads/master: 4716eaf20f37d10fd01b0fcacb3e41c1abd362c3 diff --git a/trunk/drivers/ata/pata_octeon_cf.c b/trunk/drivers/ata/pata_octeon_cf.c index d6f69561dc86..37ef416c1242 100644 --- a/trunk/drivers/ata/pata_octeon_cf.c +++ b/trunk/drivers/ata/pata_octeon_cf.c @@ -853,7 +853,7 @@ static int __devinit octeon_cf_probe(struct platform_device *pdev) return -EINVAL; cs1 = devm_ioremap_nocache(&pdev->dev, res_cs1->start, - res_cs0->end - res_cs1->start + 1); + resource_size(res_cs1)); if (!cs1) return -ENOMEM;