diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 17:07:33 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 17:07:33 -0400 |
commit | 608f593b1313080301b76875487af6da508f67a1 (patch) | |
tree | b775454cd4d1d380134c2d91ff79d0375987dc64 /drivers/block/loop.c | |
parent | a1acbbf4adcd346f12fc567143eac90ef33f29b0 (diff) | |
parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) |
Merge tag 'v3.5-rc7' into next/boards
Linux 3.5-rc7
Prerequisite for samsung/board3 branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/block/loop.c')
-rw-r--r-- | drivers/block/loop.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index bbca966f8f66..3bba65510d23 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c | |||
@@ -1597,14 +1597,12 @@ static int loop_add(struct loop_device **l, int i) | |||
1597 | struct gendisk *disk; | 1597 | struct gendisk *disk; |
1598 | int err; | 1598 | int err; |
1599 | 1599 | ||
1600 | err = -ENOMEM; | ||
1600 | lo = kzalloc(sizeof(*lo), GFP_KERNEL); | 1601 | lo = kzalloc(sizeof(*lo), GFP_KERNEL); |
1601 | if (!lo) { | 1602 | if (!lo) |
1602 | err = -ENOMEM; | ||
1603 | goto out; | 1603 | goto out; |
1604 | } | ||
1605 | 1604 | ||
1606 | err = idr_pre_get(&loop_index_idr, GFP_KERNEL); | 1605 | if (!idr_pre_get(&loop_index_idr, GFP_KERNEL)) |
1607 | if (err < 0) | ||
1608 | goto out_free_dev; | 1606 | goto out_free_dev; |
1609 | 1607 | ||
1610 | if (i >= 0) { | 1608 | if (i >= 0) { |