projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into core/urgent
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
pata_octeon_cf.c
diff --git
a/drivers/ata/pata_octeon_cf.c
b/drivers/ata/pata_octeon_cf.c
index ff2e57f3b5972521377199814a2e4f0a0aaa0ae2..e73bef3093d2be6c859c462b4f8fa50758e21b80 100644
(file)
--- a/
drivers/ata/pata_octeon_cf.c
+++ b/
drivers/ata/pata_octeon_cf.c
@@
-926,7
+926,7
@@
static int octeon_cf_probe(struct platform_device *pdev)
goto free_cf_port;
}
cs1 = devm_ioremap_nocache(&pdev->dev, res_cs1->start,
- res
_cs1->end - res_cs1->start + 1
);
+ res
ource_size(res_cs1)
);
if (!cs1)
goto free_cf_port;