diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2023-06-19 14:41:58 +0300 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2023-06-19 14:41:58 +0300 |
commit | 40e46f88a2e1c4e2d144cfbe8749ca55d4c0b1a1 (patch) | |
tree | 28707047c3eea96b35110d24b09984f107735116 /drivers/mmc/host/mtk-sd.c | |
parent | 4711c6ab585ea627560a4878917aeaa1178878c2 (diff) | |
parent | 413db499730248431c1005b392e8ed82c4fa19bf (diff) | |
download | linux-40e46f88a2e1c4e2d144cfbe8749ca55d4c0b1a1.tar.xz |
mmc: Merge branch fixes into next
Merge the mmc fixes for v6.4-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.5.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/mtk-sd.c')
-rw-r--r-- | drivers/mmc/host/mtk-sd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index 99317fd9f084..02403ff99e0d 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -2724,7 +2724,7 @@ static int msdc_drv_probe(struct platform_device *pdev) host->irq = platform_get_irq(pdev, 0); if (host->irq < 0) { - ret = -EINVAL; + ret = host->irq; goto host_free; } |