block: sed-opal: fix IOC_OPAL_ENABLE_DISABLE_MBR

[mirror_ubuntu-bionic-kernel.git] / block / sed-opal.c

diff --git a/block/sed-opal.c b/block/sed-opal.c
index 4f5e70d4abc3cd282db163c6614b24c31a4c0fe5..c64011cda9fcc65b6179dd349d9778cec93feba5 100644 (file)
--- a/block/sed-opal.c
+++ b/block/sed-opal.c
@@ -2078,13 +2078,16 @@ static int opal_erase_locking_range(struct opal_dev *dev,
 static int opal_enable_disable_shadow_mbr(struct opal_dev *dev,
                                          struct opal_mbr_data *opal_mbr)
 {
+       u8 enable_disable = opal_mbr->enable_disable == OPAL_MBR_ENABLE ?
+               OPAL_TRUE : OPAL_FALSE;
+
        const struct opal_step mbr_steps[] = {
                { opal_discovery0, },
                { start_admin1LSP_opal_session, &opal_mbr->key },
-               { set_mbr_done, &opal_mbr->enable_disable },
+               { set_mbr_done, &enable_disable },
                { end_opal_session, },
                { start_admin1LSP_opal_session, &opal_mbr->key },
-               { set_mbr_enable_disable, &opal_mbr->enable_disable },
+               { set_mbr_enable_disable, &enable_disable },
                { end_opal_session, },
                { NULL, }
        };
@@ -2204,7 +2207,7 @@ static int __opal_lock_unlock(struct opal_dev *dev,
 
 static int __opal_set_mbr_done(struct opal_dev *dev, struct opal_key *key)
 {
-       u8 mbr_done_tf = 1;
+       u8 mbr_done_tf = OPAL_TRUE;
        const struct opal_step mbrdone_step [] = {
                { opal_discovery0, },
                { start_admin1LSP_opal_session, key },