diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 10:59:37 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 10:59:37 +0200 |
| commit | f22d4e27786c8a7f58ef7167f38c3c5dd313d290 (patch) | |
| tree | a0f02af6952b17650642ceee110bc063347eea2e /drivers/base | |
| parent | 6e4b15537b522fc6d393d664c12f40b4a00b5ef6 (diff) | |
| parent | 1bb01712a717a2008efce4f76a3d8e43e4435eb3 (diff) | |
| download | barebox-f22d4e27786c8a7f58ef7167f38c3c5dd313d290.tar.gz barebox-f22d4e27786c8a7f58ef7167f38c3c5dd313d290.tar.xz | |
Merge branch 'for-next/sparse'
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index a5c6fb9293..55dbf476ac 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -241,15 +241,15 @@ static struct resource *dev_get_resource(struct device_d *dev, int num) return NULL; } -void __iomem *dev_get_mem_region(struct device_d *dev, int num) +void *dev_get_mem_region(struct device_d *dev, int num) { struct resource *res; res = dev_get_resource(dev, num); if (!res) - return res; + return NULL; - return (void __force __iomem *)res->start; + return (void __force *)res->start; } EXPORT_SYMBOL(dev_get_mem_region); |