On Tuesday 11 November 2008 17:17:45 Sheng Yang wrote: > It's possible that device got IRQ 0 before initialized. Then IRQ 0 would be > disabled by pci_reset_function()... Hi, Jesse Can you help to queue this for 2.6.28? It's a indeed a bug fix and necessary to go for upstream. Sorry for forgot to mention... Thanks! -- regards Yang, Sheng > > Reviewed-by: Matthew Wilcox <willy@xxxxxxxxxxxxxxx> > Signed-off-by: Sheng Yang <sheng@xxxxxxxxxxxxxxx> > --- > drivers/pci/pci.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index 21f2ac6..28af496 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -1832,7 +1832,7 @@ int pci_reset_function(struct pci_dev *dev) > if (!(cap & PCI_EXP_DEVCAP_FLR)) > return -ENOTTY; > > - if (!dev->msi_enabled && !dev->msix_enabled) > + if (!dev->msi_enabled && !dev->msix_enabled && dev->irq != 0) > disable_irq(dev->irq); > pci_save_state(dev); > > @@ -1841,7 +1841,7 @@ int pci_reset_function(struct pci_dev *dev) > r = pci_execute_reset_function(dev); > > pci_restore_state(dev); > - if (!dev->msi_enabled && !dev->msix_enabled) > + if (!dev->msi_enabled && !dev->msix_enabled && dev->irq != 0) > enable_irq(dev->irq); > > return r; -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
