aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/zram/zram_drv.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index b704d06943f5..79ce363b2ea9 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -648,6 +648,9 @@ static ssize_t reset_store(struct device *dev,
648 zram = dev_to_zram(dev); 648 zram = dev_to_zram(dev);
649 bdev = bdget_disk(zram->disk, 0); 649 bdev = bdget_disk(zram->disk, 0);
650 650
651 if (!bdev)
652 return -ENOMEM;
653
651 /* Do not reset an active device! */ 654 /* Do not reset an active device! */
652 if (bdev->bd_holders) 655 if (bdev->bd_holders)
653 return -EBUSY; 656 return -EBUSY;
@@ -660,8 +663,7 @@ static ssize_t reset_store(struct device *dev,
660 return -EINVAL; 663 return -EINVAL;
661 664
662 /* Make sure all pending I/O is finished */ 665 /* Make sure all pending I/O is finished */
663 if (bdev) 666 fsync_bdev(bdev);
664 fsync_bdev(bdev);
665 667
666 zram_reset_device(zram, true); 668 zram_reset_device(zram, true);
667 return len; 669 return len;