mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
mmc: Merge branch fixes into next
Merge the mmc fixes for v7.3-rc[n] into the next branch, to allow them to get tested together with the mmc changes that are targeted for the next release. Signed-off-by: Ulf Hansson <ulfh@kernel.org>
This commit is contained in:
commit
155f6759c2
|
|
@ -1461,6 +1461,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
|
|||
host->pd = pdev;
|
||||
|
||||
spin_lock_init(&host->lock);
|
||||
mutex_init(&host->thread_lock);
|
||||
|
||||
mmc->ops = &sh_mmcif_ops;
|
||||
sh_mmcif_init_ocr(host);
|
||||
|
|
@ -1515,8 +1516,6 @@ static int sh_mmcif_probe(struct platform_device *pdev)
|
|||
goto err_clk;
|
||||
}
|
||||
|
||||
mutex_init(&host->thread_lock);
|
||||
|
||||
ret = mmc_add_host(mmc);
|
||||
if (ret < 0)
|
||||
goto err_clk;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user