Skip to content

Commit fec874a

Browse files
b1c1l1gregkh
authored andcommitted
mei: me: fix irq number stored in hw struct
Commit 261b3e1 ("mei: me: store irq number in the hw struct.") stores the irq number in the hw struct before MSI is enabled. This caused a regression for mei_me_synchronize_irq() waiting for the wrong irq number. On my laptop this causes a hang on shutdown. Fix the issue by storing the irq number after enabling MSI. Fixes: 261b3e1 ("mei: me: store irq number in the hw struct.") Signed-off-by: Benjamin Lee <[email protected]> Cc: stable <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ae83d0b commit fec874a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/misc/mei/pci-me.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,12 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
203203
}
204204
hw = to_me_hw(dev);
205205
hw->mem_addr = pcim_iomap_table(pdev)[0];
206-
hw->irq = pdev->irq;
207206
hw->read_fws = mei_me_read_fws;
208207

209208
pci_enable_msi(pdev);
210209

210+
hw->irq = pdev->irq;
211+
211212
/* request and enable interrupt */
212213
irqflags = pci_dev_msi_enabled(pdev) ? IRQF_ONESHOT : IRQF_SHARED;
213214

0 commit comments

Comments
 (0)