diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-21 11:50:16 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-21 11:50:16 +1000 |
commit | cc4057e28b7a858b52a8e195829c9f7c3aefba00 (patch) | |
tree | ea080cb6882b8471ce6d654a89d5fbbd6ea4e8c1 /drivers/input/serio/at32psif.c | |
parent | c653ff6376db749333a2422e0f76285d63be29fa (diff) | |
parent | fc69f4a6af49ee69475dc4217924d9edf77760e0 (diff) |
Merge commit 'input/next'
Diffstat (limited to 'drivers/input/serio/at32psif.c')
-rw-r--r-- | drivers/input/serio/at32psif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/at32psif.c b/drivers/input/serio/at32psif.c index 41fda8c67b1e..a6fb7a3dcc46 100644 --- a/drivers/input/serio/at32psif.c +++ b/drivers/input/serio/at32psif.c @@ -231,7 +231,7 @@ static int __init psif_probe(struct platform_device *pdev) goto out_free_io; } - psif->regs = ioremap(regs->start, regs->end - regs->start + 1); + psif->regs = ioremap(regs->start, resource_size(regs)); if (!psif->regs) { ret = -ENOMEM; dev_dbg(&pdev->dev, "could not map I/O memory\n"); |