git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hwmod_dss_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fixes-dss
[pandora-kernel.git]
/
drivers
/
hwspinlock
/
u8500_hsem.c
diff --git
a/drivers/hwspinlock/u8500_hsem.c
b/drivers/hwspinlock/u8500_hsem.c
index
143461a
..
86980fe
100644
(file)
--- a/
drivers/hwspinlock/u8500_hsem.c
+++ b/
drivers/hwspinlock/u8500_hsem.c
@@
-21,6
+21,7
@@
* General Public License for more details.
*/
* General Public License for more details.
*/
+#include <linux/module.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/pm_runtime.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));
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);
/* make sure protocol 1 is selected */
val = readl(io_base + HSEM_CTRL_REG);