Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8f17084 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 6ccce2b3 fdcb2363

drivers/hwspinlock/u8500_hsem.c

+2 −4
Original line number Diff line number Diff line
@@ -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);

include/linux/hwspinlock.h

+0 −1
Original line number Diff line number Diff line
@@ -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)