Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a677b67b authored by Ulf Hansson's avatar Ulf Hansson
Browse files

Merge branch 'fixes' into next

parents 8ef0797a c658dc58

drivers/mmc/host/dw_mmc-exynos.c

+7 −1
Original line number Diff line number Diff line
@@ -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;

}



/**

include/trace/events/mmc.h

+2 −2
Original line number Diff line number Diff line
@@ -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)