1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index 2c4ed52ca849..b704d06943f5 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -896,13 +896,10 @@ static void destroy_device(struct zram *zram)
         sysfs_remove_group(&disk_to_dev(zram->disk)->kobj,
                         &zram_disk_attr_group);
 
-        if (zram->disk) {
-                del_gendisk(zram->disk);
-                put_disk(zram->disk);
-        }
+        del_gendisk(zram->disk);
+        put_disk(zram->disk);
 
-        if (zram->queue)
-                blk_cleanup_queue(zram->queue);
+        blk_cleanup_queue(zram->queue);
 }
 
 static int __init zram_init(void)