greybus: fix unbalanced mutex
authorAlex Elder <elder@linaro.org>
Tue, 24 May 2016 18:34:48 +0000 (13:34 -0500)
committerGreg Kroah-Hartman <gregkh@google.com>
Fri, 27 May 2016 18:28:16 +0000 (11:28 -0700)
Running "make coccicheck" on the Greybus code reports that
gb_mmc_get_ro() and gb_mmc_get_cd() can return without releasing
the mutex it acquired if there's an error.  Fix this.

Signed-off-by: Alex Elder <elder@linaro.org>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
drivers/staging/greybus/sdio.c

index 4d4cfdf..bdcc869 100644 (file)
@@ -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;
 }