Merge tag 'hwmon-for-v7.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...

[linux.git] / drivers / mmc / core / block.c

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index 0274e8d07660dd0e3af237da6ba91480d2c0a9da..54a923ba4f1e7d3bf0f3e303801c1f5639350b8d 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -2715,7 +2715,6 @@ static void mmc_blk_rpmb_device_release(struct device *dev)
 {
        struct mmc_rpmb_data *rpmb = dev_get_drvdata(dev);
 
-       rpmb_dev_unregister(rpmb->rdev);
        mmc_blk_put(rpmb->md);
        ida_free(&mmc_rpmb_ida, rpmb->id);
        kfree(rpmb);
@@ -2930,8 +2929,8 @@ out_put_device:
 }
 
 static void mmc_blk_remove_rpmb_part(struct mmc_rpmb_data *rpmb)
-
 {
+       rpmb_dev_unregister(rpmb->rdev);
        cdev_device_del(&rpmb->chrdev, &rpmb->dev);
        put_device(&rpmb->dev);
 }