diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2023-06-19 13:41:58 +0200 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2023-06-19 13:41:58 +0200 |
commit | 40e46f88a2e1c4e2d144cfbe8749ca55d4c0b1a1 (patch) | |
tree | 28707047c3eea96b35110d24b09984f107735116 /drivers/mmc/host/sdhci-spear.c | |
parent | 4711c6ab585ea627560a4878917aeaa1178878c2 (diff) | |
parent | 413db499730248431c1005b392e8ed82c4fa19bf (diff) | |
download | linux-stable-40e46f88a2e1c4e2d144cfbe8749ca55d4c0b1a1.tar.gz linux-stable-40e46f88a2e1c4e2d144cfbe8749ca55d4c0b1a1.tar.bz2 linux-stable-40e46f88a2e1c4e2d144cfbe8749ca55d4c0b1a1.zip |
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/sdhci-spear.c')
-rw-r--r-- | drivers/mmc/host/sdhci-spear.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c index d463e2fd5b1a..c79035727b20 100644 --- a/drivers/mmc/host/sdhci-spear.c +++ b/drivers/mmc/host/sdhci-spear.c @@ -65,8 +65,8 @@ static int sdhci_probe(struct platform_device *pdev) host->hw_name = "sdhci"; host->ops = &sdhci_pltfm_ops; host->irq = platform_get_irq(pdev, 0); - if (host->irq <= 0) { - ret = -EINVAL; + if (host->irq < 0) { + ret = host->irq; goto err_host; } host->quirks = SDHCI_QUIRK_BROKEN_ADMA; |