summaryrefslogtreecommitdiffstats
path: root/include/linux/mmc/host.h
diff options
context:
space:
mode:
authorSimon Baatz2013-06-09 22:14:11 +0200
committerChris Ball2013-06-27 16:22:44 +0200
commitec0a7517dc25b4cca8a694fd61e09771bffba022 (patch)
treef0d9f2cc5624ce459320dd6ec9a038060f510fc0 /include/linux/mmc/host.h
parentmmc: jz4740: Use clk_prepare_enable/clk_disable_unprepare (diff)
downloadkernel-qcow2-linux-ec0a7517dc25b4cca8a694fd61e09771bffba022.tar.gz
kernel-qcow2-linux-ec0a7517dc25b4cca8a694fd61e09771bffba022.tar.xz
kernel-qcow2-linux-ec0a7517dc25b4cca8a694fd61e09771bffba022.zip
mmc: return mmc_of_parse() errors to caller
In addition to just logging errors encountered during DT parsing or allocating GPIO slots for CD/WP, mmc_of_parse() now returns with an error. In particular, this is needed if the GPIO allocation may return EPROBE_DEFER. Signed-off-by: Simon Baatz <gmbnomis@gmail.com> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'include/linux/mmc/host.h')
-rw-r--r--include/linux/mmc/host.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 2e34ee5cefce..eb2e6e1e5a3e 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -369,7 +369,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *);
int mmc_add_host(struct mmc_host *);
void mmc_remove_host(struct mmc_host *);
void mmc_free_host(struct mmc_host *);
-void mmc_of_parse(struct mmc_host *host);
+int mmc_of_parse(struct mmc_host *host);
static inline void *mmc_priv(struct mmc_host *host)
{