diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 21:50:54 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 21:50:54 +0100 |
| commit | c8f17084fe0fa7fdb5ff21eab9ccce49439ebdb1 (patch) | |
| tree | f0ba7e8b50a4f103caa1c5033d30375c2d1dd5ed | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
| parent | hwspinlock/u8500: fix build error due to undefined label (diff) | |
| download | linux-c8f17084fe0fa7fdb5ff21eab9ccce49439ebdb1.tar.xz linux-c8f17084fe0fa7fdb5ff21eab9ccce49439ebdb1.zip | |
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
| -rw-r--r-- | drivers/hwspinlock/u8500_hsem.c | 6 | ||||
| -rw-r--r-- | include/linux/hwspinlock.h | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/hwspinlock/u8500_hsem.c b/drivers/hwspinlock/u8500_hsem.c index 143461a95ae4..a120f14814f9 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); diff --git a/include/linux/hwspinlock.h b/include/linux/hwspinlock.h index 08a2fee40659..aad6bd4b3efd 100644 --- a/include/linux/hwspinlock.h +++ b/include/linux/hwspinlock.h @@ -118,7 +118,6 @@ int __hwspin_trylock(struct hwspinlock *hwlock, int mode, unsigned long *flags) static inline void __hwspin_unlock(struct hwspinlock *hwlock, int mode, unsigned long *flags) { - return 0; } static inline int hwspin_lock_get_id(struct hwspinlock *hwlock) |