diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2018-03-15 14:43:28 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2018-03-15 14:43:28 +0100 |
| commit | a677b67b6994e491f564f9ef773c49a1cd0d9720 (patch) | |
| tree | 763c5d2a8d194922188d056802fa74c373a6ebe1 | |
| parent | 8ef0797a898b166016d486d6f30ce6044f800ddb (diff) | |
| parent | c658dc58c7eaa8569ceb0edd1ddbdfda84fe8aa5 (diff) | |
Merge branch 'fixes' into next
| -rw-r--r-- | drivers/mmc/host/dw_mmc-exynos.c | 8 | ||||
| -rw-r--r-- | include/trace/events/mmc.h | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c index fa41d9422d57..a84aa3f1ae85 100644 --- a/drivers/mmc/host/dw_mmc-exynos.c +++ b/drivers/mmc/host/dw_mmc-exynos.c @@ -165,9 +165,15 @@ static void dw_mci_exynos_set_clksel_timing(struct dw_mci *host, u32 timing) static int dw_mci_exynos_runtime_resume(struct device *dev) { struct dw_mci *host = dev_get_drvdata(dev); + int ret; + + ret = dw_mci_runtime_resume(dev); + if (ret) + return ret; dw_mci_exynos_config_smu(host); - return dw_mci_runtime_resume(dev); + + return ret; } /** diff --git a/include/trace/events/mmc.h b/include/trace/events/mmc.h index 200f731be557..7b706ff21335 100644 --- a/include/trace/events/mmc.h +++ b/include/trace/events/mmc.h @@ -86,8 +86,8 @@ TRACE_EVENT(mmc_request_start, __entry->stop_flags, __entry->stop_retries, __entry->sbc_opcode, __entry->sbc_arg, __entry->sbc_flags, __entry->sbc_retries, - __entry->blocks, __entry->blk_addr, - __entry->blksz, __entry->data_flags, __entry->tag, + __entry->blocks, __entry->blksz, + __entry->blk_addr, __entry->data_flags, __entry->tag, __entry->can_retune, __entry->doing_retune, __entry->retune_now, __entry->need_retune, __entry->hold_retune, __entry->retune_period) |