diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-26 20:17:44 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-26 20:17:44 +0200 |
| commit | f6da8bd15202685ed809f1a6d24a0a060ee0954d (patch) | |
| tree | 44a8bcc53bb2e31aff0f21bc2a3bfd3eda99824e /drivers/misc | |
| parent | Merge tag 'staging-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | interconnect: qcom: Fix uninitialized tcs_cmd::wait (diff) | |
| download | linux-f6da8bd15202685ed809f1a6d24a0a060ee0954d.tar.xz linux-f6da8bd15202685ed809f1a6d24a0a060ee0954d.zip | |
Merge tag 'char-misc-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver fixes from Greg KH:
"Here are 4 small misc driver fixes for 5.7-rc3:
- mei driver fix
- interconnect driver fix
- two fpga driver fixes
All have been in linux-next with no reported issues"
* tag 'char-misc-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
interconnect: qcom: Fix uninitialized tcs_cmd::wait
mei: me: fix irq number stored in hw struct
fpga: dfl: pci: fix return value of cci_pci_sriov_configure
fpga: zynq: Remove clk_get error message for probe defer
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/pci-me.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index 3d21c38e2dbb..0c390fe421ad 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -203,11 +203,12 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } hw = to_me_hw(dev); hw->mem_addr = pcim_iomap_table(pdev)[0]; - hw->irq = pdev->irq; hw->read_fws = mei_me_read_fws; pci_enable_msi(pdev); + hw->irq = pdev->irq; + /* request and enable interrupt */ irqflags = pci_dev_msi_enabled(pdev) ? IRQF_ONESHOT : IRQF_SHARED; |