On (02/04/15 16:25), a...@linux-foundation.org wrote:
> The patch titled
> Subject: zram-rework-reset-and-destroy-path-fix-2-fix
>
> This patch was dropped because it was withdrawn
>
simplifications
Signed-off-by: Sergey Senozhatsky <sergey.senozhat...@gmail.com>
---
drivers/block/zram/zram_drv.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 0ed8881..07964dd 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1143,7 +1143,7 @@ static void destroy_devices(unsigned int nr)
static int __init zram_init(void)
{
- int ret = -ENOMEM, dev_id = 0;
+ int ret, dev_id;
if (num_devices > max_num_devices) {
pr_warn("Invalid value for num_devices: %u\n",
@@ -1159,8 +1159,10 @@ static int __init zram_init(void)
/* Allocate the device array and initialize each one */
zram_devices = kzalloc(num_devices * sizeof(struct zram), GFP_KERNEL);
- if (!zram_devices)
- goto out_error;
+ if (!zram_devices) {
+ unregister_blkdev(zram_major, "zram");
+ return -ENOMEM;
+ }
for (dev_id = 0; dev_id < num_devices; dev_id++) {
ret = create_device(&zram_devices[dev_id], dev_id);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
