iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

greybus: fix unbalanced mutex

Browse Source 
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>
This commit is contained in:
Alex Elder 2016-05-24 13:34:48 -05:00 committed by Greg Kroah-Hartman
parent f9340fc7dd
commit ebc9e3750d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/greybus/sdio.c
View File

@ -684,9 +684,12 @@ static int gb_mmc_get_ro(struct mmc_host *mmc)
struct gb_sdio_host *host = mmc_priv(mmc); struct gb_sdio_host *host = mmc_priv(mmc);
mutex_lock(&host->lock); mutex_lock(&host->lock);
if (host->removed) if (host->removed) {
mutex_unlock(&host->lock);
return -ESHUTDOWN; return -ESHUTDOWN;
}
mutex_unlock(&host->lock); mutex_unlock(&host->lock);
return host->read_only; 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); struct gb_sdio_host *host = mmc_priv(mmc);
mutex_lock(&host->lock); mutex_lock(&host->lock);
if (host->removed) if (host->removed) {
mutex_unlock(&host->lock);
return -ESHUTDOWN; return -ESHUTDOWN;
}
mutex_unlock(&host->lock); mutex_unlock(&host->lock);
return host->card_present; return host->card_present;
} }