Skip to content

Commit fb7d0e5

Browse files
committed
Revert "firewire: ohci: use devres for requested IRQ"
This reverts commit 5a95f1d. As long as allocating any device interrupt vector for MSI, it is inconvenient to utilize managed device resources for IRQ requesting. Link: https://lore.kernel.org/r/20240331135037.191479-2-o-takashi@sakamocchi.jp Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
1 parent d315574 commit fb7d0e5

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

drivers/firewire/ohci.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3758,16 +3758,17 @@ static int pci_probe(struct pci_dev *dev,
37583758

37593759
if (!(ohci->quirks & QUIRK_NO_MSI))
37603760
pci_enable_msi(dev);
3761-
err = devm_request_irq(&dev->dev, dev->irq, irq_handler,
3762-
pci_dev_msi_enabled(dev) ? 0 : IRQF_SHARED, ohci_driver_name, ohci);
3763-
if (err < 0) {
3761+
if (request_irq(dev->irq, irq_handler,
3762+
pci_dev_msi_enabled(dev) ? 0 : IRQF_SHARED,
3763+
ohci_driver_name, ohci)) {
37643764
ohci_err(ohci, "failed to allocate interrupt %d\n", dev->irq);
3765+
err = -EIO;
37653766
goto fail_msi;
37663767
}
37673768

37683769
err = fw_card_add(&ohci->card, max_receive, link_speed, guid);
37693770
if (err)
3770-
goto fail_msi;
3771+
goto fail_irq;
37713772

37723773
version = reg_read(ohci, OHCI1394_Version) & 0x00ff00ff;
37733774
ohci_notice(ohci,
@@ -3780,8 +3781,9 @@ static int pci_probe(struct pci_dev *dev,
37803781

37813782
return 0;
37823783

3784+
fail_irq:
3785+
free_irq(dev->irq, ohci);
37833786
fail_msi:
3784-
devm_free_irq(&dev->dev, dev->irq, ohci);
37853787
pci_disable_msi(dev);
37863788

37873789
return err;
@@ -3809,7 +3811,7 @@ static void pci_remove(struct pci_dev *dev)
38093811

38103812
software_reset(ohci);
38113813

3812-
devm_free_irq(&dev->dev, dev->irq, ohci);
3814+
free_irq(dev->irq, ohci);
38133815
pci_disable_msi(dev);
38143816

38153817
dev_notice(&dev->dev, "removing fw-ohci device\n");

0 commit comments

Comments
 (0)