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
Pb1200/DBAu1200: fix bad IDE resource size
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ide
/
mips
/
au1xxx-ide.c
diff --git
a/drivers/ide/mips/au1xxx-ide.c
b/drivers/ide/mips/au1xxx-ide.c
index f84411b6609a9d5299708972270ac142598237ca..85c016bdfd38b4948770c2a60ae7a5bc42b6ca38 100644
(file)
--- a/
drivers/ide/mips/au1xxx-ide.c
+++ b/
drivers/ide/mips/au1xxx-ide.c
@@
-586,13
+586,14
@@
static int au_ide_probe(struct device *dev)
goto out;
}
goto out;
}
- if (!request_mem_region (res->start, res->end-res->start, pdev->name)) {
+ if (!request_mem_region(res->start, res->end - res->start + 1,
+ pdev->name)) {
pr_debug("%s: request_mem_region failed\n", DRV_NAME);
ret = -EBUSY;
goto out;
}
pr_debug("%s: request_mem_region failed\n", DRV_NAME);
ret = -EBUSY;
goto out;
}
- ahwif->regbase = (u32)ioremap(res->start, res->end
-res->start
);
+ ahwif->regbase = (u32)ioremap(res->start, res->end
- res->start + 1
);
if (ahwif->regbase == 0) {
ret = -ENOMEM;
goto out;
if (ahwif->regbase == 0) {
ret = -ENOMEM;
goto out;
@@
-677,7
+678,7
@@
static int au_ide_remove(struct device *dev)
iounmap((void *)ahwif->regbase);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
iounmap((void *)ahwif->regbase);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- release_mem_region(res->start, res->end - res->start);
+ release_mem_region(res->start, res->end - res->start
+ 1
);
return 0;
}
return 0;
}