On Mittwoch 11 März 2009 20:22:56 Linus Torvalds wrote: > On Tue, 10 Mar 2009, Matthew Wilcox wrote: > > These are the PCI fixes that have been piling up for the last week while > > Jesse's been on vacation. I don't think there's anything questionable > > here. All the patches have been posted to linux-pci. > > Grrr. It doesn't even compile cleanly: > > drivers/pci/quirks.c: In function ‘ht_check_msi_mapping’: > drivers/pci/quirks.c:2142: warning: ‘return’ with no value, in function > returning non-void > > and yes, it's a real bug. > > I'm not happy. > > I assume the proper fix is this trivial one-liner, but people should > double-check. > > Not pulled. As I explained to Matthew Wilcox my small patch was incorrectly applied. It originally was in static void __devinit __nv_msi_ht_cap_quirk(struct pci_dev *dev, int all) I don't know who or how it moved into static int __devinit ht_check_msi_mapping(struct pci_dev *dev) where it breaks for obvious reasons. > > Linus > > --- > drivers/pci/quirks.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > index a13f3d7..4ba55d0 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -2139,7 +2139,7 @@ static int __devinit ht_check_msi_mapping(struct > pci_dev *dev) > > /* Enabling HT MSI mapping on this device breaks MCP51 */ > if (dev->device == 0x270) > - return; > + return 0; > > /* check if there is HT MSI cap or enabled on this device */ > pos = pci_find_ht_capability(dev, HT_CAPTYPE_MSI_MAPPING); > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- 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
