projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.31-rc4' into next
[linux-2.6-block.git]
/
drivers
/
input
/
misc
/
cobalt_btns.c
diff --git
a/drivers/input/misc/cobalt_btns.c
b/drivers/input/misc/cobalt_btns.c
index d114d3a9e1e94b7129870642943d7ac91a368cac..ee73d7219c9280c6be1a3e3c7b4c82d6ef4a0b72 100644
(file)
--- a/
drivers/input/misc/cobalt_btns.c
+++ b/
drivers/input/misc/cobalt_btns.c
@@
-116,7
+116,7
@@
static int __devinit cobalt_buttons_probe(struct platform_device *pdev)
}
bdev->poll_dev = poll_dev;
- bdev->reg = ioremap(res->start, res
->end - res->start + 1
);
+ bdev->reg = ioremap(res->start, res
ource_size(res)
);
dev_set_drvdata(&pdev->dev, bdev);
error = input_register_polled_device(poll_dev);