diff --git a/[refs] b/[refs] index c843899007b3..ccbcc50295aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 816af3bb5022c1468b3d826c645ddc2cac45bc97 +refs/heads/master: fdcb23634c9b6649bb02c681033d4973491b0e35 diff --git a/trunk/drivers/hwspinlock/u8500_hsem.c b/trunk/drivers/hwspinlock/u8500_hsem.c index 143461a95ae4..a120f14814f9 100644 --- a/trunk/drivers/hwspinlock/u8500_hsem.c +++ b/trunk/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);