diff options
| author | Martin Blumenstingl <martin.blumenstingl@googlemail.com> | 2019-02-09 01:58:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-23 09:07:26 +0100 |
| commit | f9e6a18a44de0625a57e8b4fc2d10f0eb205047c (patch) | |
| tree | c056e9cb8aad216cf2572f6bc7f9e4108bb58dc2 /drivers | |
| parent | 88bfdab618dffd22db9b0cf29a913231bf67e1e3 (diff) | |
| download | linux-stable-f9e6a18a44de0625a57e8b4fc2d10f0eb205047c.tar.gz linux-stable-f9e6a18a44de0625a57e8b4fc2d10f0eb205047c.tar.bz2 linux-stable-f9e6a18a44de0625a57e8b4fc2d10f0eb205047c.zip | |
mmc: meson-gx: fix interrupt name
commit 83e418a805d880a8b18add07f94d19b2a5a80307 upstream.
Commit bb364890323cca ("mmc: meson-gx: Free irq in release() callback")
changed the _probe code to use request_threaded_irq() instead of
devm_request_threaded_irq().
Unfortunately this removes a fallback for the interrupt name:
devm_request_threaded_irq() uses the device name as fallback if the
given IRQ name is NULL. request_threaded_irq() has no such fallback,
thus /proc/interrupts shows "(null)" instead.
Explicitly pass the dev_name() so we get the IRQ name shown in
/proc/interrupts again.
While here, also fix the indentation of the request_threaded_irq()
parameter list.
Fixes: bb364890323cca ("mmc: meson-gx: Free irq in release() callback")
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/meson-gx-mmc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index ef9deaa361c7..ddd98cdd33bc 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -1286,7 +1286,8 @@ static int meson_mmc_probe(struct platform_device *pdev) host->regs + SD_EMMC_IRQ_EN); ret = request_threaded_irq(host->irq, meson_mmc_irq, - meson_mmc_irq_thread, IRQF_SHARED, NULL, host); + meson_mmc_irq_thread, IRQF_SHARED, + dev_name(&pdev->dev), host); if (ret) goto err_init_clk; |