diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 12:50:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 12:50:54 -0800 |
| commit | c8f17084fe0fa7fdb5ff21eab9ccce49439ebdb1 (patch) | |
| tree | f0ba7e8b50a4f103caa1c5033d30375c2d1dd5ed /drivers | |
| parent | 6ccce2b32900a8a6f481036e0cbbfe174742352c (diff) | |
| parent | fdcb23634c9b6649bb02c681033d4973491b0e35 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock:
hwspinlock/u8500: fix build error due to undefined label
hwspinlock: Don't return a value in __hwspin_unlock
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwspinlock/u8500_hsem.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/hwspinlock/u8500_hsem.c b/drivers/hwspinlock/u8500_hsem.c index 143461a95ae..a120f14814f 100644 --- a/drivers/hwspinlock/u8500_hsem.c +++ b/drivers/hwspinlock/u8500_hsem.c @@ -108,10 +108,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); |