diff --git a/drivers/staging/greybus/sdio.c b/drivers/staging/greybus/sdio.c
index 4d4cfdf8edb6..bdcc86923c54 100644
--- a/drivers/staging/greybus/sdio.c
+++ b/drivers/staging/greybus/sdio.c
@@ -684,9 +684,12 @@ static int gb_mmc_get_ro(struct mmc_host *mmc)
 	struct gb_sdio_host *host = mmc_priv(mmc);
 
 	mutex_lock(&host->lock);
-	if (host->removed)
+	if (host->removed) {
+		mutex_unlock(&host->lock);
 		return -ESHUTDOWN;
+	}
 	mutex_unlock(&host->lock);
+
 	return host->read_only;
 }
 
@@ -695,9 +698,12 @@ static int gb_mmc_get_cd(struct mmc_host *mmc)
 	struct gb_sdio_host *host = mmc_priv(mmc);
 
 	mutex_lock(&host->lock);
-	if (host->removed)
+	if (host->removed) {
+		mutex_unlock(&host->lock);
 		return -ESHUTDOWN;
+	}
 	mutex_unlock(&host->lock);
+
 	return host->card_present;
 }