git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus
[pandora-kernel.git]
/
drivers
/
watchdog
/
max63xx_wdt.c
diff --git
a/drivers/watchdog/max63xx_wdt.c
b/drivers/watchdog/max63xx_wdt.c
index
7a82ce5
..
73ba2fd
100644
(file)
--- a/
drivers/watchdog/max63xx_wdt.c
+++ b/
drivers/watchdog/max63xx_wdt.c
@@
-270,7
+270,6
@@
static int __devinit max63xx_wdt_probe(struct platform_device *pdev)
{
int ret = 0;
int size;
{
int ret = 0;
int size;
- struct resource *res;
struct device *dev = &pdev->dev;
struct max63xx_timeout *table;
struct device *dev = &pdev->dev;
struct max63xx_timeout *table;
@@
-294,21
+293,19
@@
static int __devinit max63xx_wdt_probe(struct platform_device *pdev)
max63xx_pdev = pdev;
max63xx_pdev = pdev;
-
res
= platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (
res
== NULL) {
+
wdt_mem
= platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (
wdt_mem
== NULL) {
dev_err(dev, "failed to get memory region resource\n");
return -ENOENT;
}
dev_err(dev, "failed to get memory region resource\n");
return -ENOENT;
}
- size = resource_size(res);
- wdt_mem = request_mem_region(res->start, size, pdev->name);
-
- if (wdt_mem == NULL) {
+ size = resource_size(wdt_mem);
+ if (!request_mem_region(wdt_mem->start, size, pdev->name)) {
dev_err(dev, "failed to get memory region\n");
return -ENOENT;
}
dev_err(dev, "failed to get memory region\n");
return -ENOENT;
}
- wdt_base = ioremap(
res
->start, size);
+ wdt_base = ioremap(
wdt_mem
->start, size);
if (!wdt_base) {
dev_err(dev, "failed to map memory region\n");
ret = -ENOMEM;
if (!wdt_base) {
dev_err(dev, "failed to map memory region\n");
ret = -ENOMEM;
@@
-326,8
+323,8
@@
static int __devinit max63xx_wdt_probe(struct platform_device *pdev)
out_unmap:
iounmap(wdt_base);
out_request:
out_unmap:
iounmap(wdt_base);
out_request:
- release_
resource(wdt_mem
);
-
kfree(wdt_mem)
;
+ release_
mem_region(wdt_mem->start, size
);
+
wdt_mem = NULL
;
return ret;
}
return ret;
}
@@
-336,8
+333,7
@@
static int __devexit max63xx_wdt_remove(struct platform_device *pdev)
{
misc_deregister(&max63xx_wdt_miscdev);
if (wdt_mem) {
{
misc_deregister(&max63xx_wdt_miscdev);
if (wdt_mem) {
- release_resource(wdt_mem);
- kfree(wdt_mem);
+ release_mem_region(wdt_mem->start, resource_size(wdt_mem));
wdt_mem = NULL;
}
wdt_mem = NULL;
}