diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-01-11 23:11:29 +0400 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-01-11 23:11:29 +0400 |
| commit | 5878cf431ca7233a56819ca6970153ac0b129599 (patch) | |
| tree | e5d21d04a0b468d2dabbe3a3824f23b5537fc6a7 /drivers/hwspinlock/u8500_hsem.c | |
| parent | 74ee4ef1f901fbb014bdcdc9171d126490ce2b62 (diff) | |
| parent | b13683d1cc14d1dd30b8e20f3ebea3f814ad029f (diff) | |
| download | linux-5878cf431ca7233a56819ca6970153ac0b129599.tar.xz | |
Merge branch 'slab/urgent' into slab/for-linus
Diffstat (limited to 'drivers/hwspinlock/u8500_hsem.c')
| -rw-r--r-- | drivers/hwspinlock/u8500_hsem.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/hwspinlock/u8500_hsem.c b/drivers/hwspinlock/u8500_hsem.c index 143461a95ae4..86980fe04117 100644 --- a/drivers/hwspinlock/u8500_hsem.c +++ b/drivers/hwspinlock/u8500_hsem.c @@ -21,6 +21,7 @@ * General Public License for more details. */ +#include <linux/module.h> #include <linux/delay.h> #include <linux/io.h> #include <linux/pm_runtime.h> @@ -108,10 +109,8 @@ static int __devinit u8500_hsem_probe(struct platform_device *pdev) return -ENODEV; io_base = ioremap(res->start, resource_size(res)); - if (!io_base) { - ret = -ENOMEM; - goto free_state; - } + if (!io_base) + return -ENOMEM; /* make sure protocol 1 is selected */ val = readl(io_base + HSEM_CTRL_REG); |