diff options
| author |   Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> | 2021-01-21 13:23:01 +0530 |
|---|---|---|
| committer | Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> | 2021-01-21 13:23:01 +0530 |
| commit | cdce2663ffb8b63ea278802e15e4d1300547e937 (patch) | |
| tree | 943d2dfbbc27d4f71bb42e9d37731e564ae1415d /drivers/bus | |
| parent | mhi: pci_generic: Fix shared MSI vector support (diff) | |
| parent | mhi: use irq_flags if controller driver configures it (diff) | |
| download | linux-dev-cdce2663ffb8b63ea278802e15e4d1300547e937.tar.xz linux-dev-cdce2663ffb8b63ea278802e15e4d1300547e937.zip | |
Merge branch 'mhi-ath11k-immutable' into mhi-next
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/mhi/core/init.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c index f0697f433c2f..aa575d3fb3ae 100644 --- a/drivers/bus/mhi/core/init.c +++ b/drivers/bus/mhi/core/init.c @@ -151,12 +151,17 @@ int mhi_init_irq_setup(struct mhi_controller *mhi_cntrl) { struct mhi_event *mhi_event = mhi_cntrl->mhi_event; struct device *dev = &mhi_cntrl->mhi_dev->dev; + unsigned long irq_flags = IRQF_SHARED | IRQF_NO_SUSPEND; int i, ret; + /* if controller driver has set irq_flags, use it */ + if (mhi_cntrl->irq_flags) + irq_flags = mhi_cntrl->irq_flags; + /* Setup BHI_INTVEC IRQ */ ret = request_threaded_irq(mhi_cntrl->irq[0], mhi_intvec_handler, mhi_intvec_threaded_handler, - IRQF_SHARED | IRQF_NO_SUSPEND, + irq_flags, "bhi", mhi_cntrl); if (ret) return ret; @@ -174,7 +179,7 @@ int mhi_init_irq_setup(struct mhi_controller *mhi_cntrl) ret = request_irq(mhi_cntrl->irq[mhi_event->irq], mhi_irq_handler, - IRQF_SHARED | IRQF_NO_SUSPEND, + irq_flags, "mhi", mhi_event); if (ret) { dev_err(dev, "Error requesting irq:%d for ev:%d\n", |