X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=block%2Fsed-opal.c;h=04f38a3f5d9597927534e15d4dc3432fe12f9e3a;hb=refs%2Fheads%2Ftizen;hp=6d7f25d1711ba7be464f8cf444426f9337181d52;hpb=68bb0c78d3e451a7289d32d733bcd396b5da4a55;p=platform%2Fkernel%2Flinux-rpi.git

diff --git a/block/sed-opal.c b/block/sed-opal.c
index 6d7f25d..04f38a3 100644
--- a/block/sed-opal.c
+++ b/block/sed-opal.c
@@ -2888,12 +2888,11 @@ static int opal_lock_unlock(struct opal_dev *dev,
 	if (lk_unlk->session.who > OPAL_USER9)
 		return -EINVAL;
 
-	ret = opal_get_key(dev, &lk_unlk->session.opal_key);
-	if (ret)
-		return ret;
 	mutex_lock(&dev->dev_lock);
 	opal_lock_check_for_saved_key(dev, lk_unlk);
-	ret = __opal_lock_unlock(dev, lk_unlk);
+	ret = opal_get_key(dev, &lk_unlk->session.opal_key);
+	if (!ret)
+		ret = __opal_lock_unlock(dev, lk_unlk);
 	mutex_unlock(&dev->dev_lock);
 
 	return ret;