The patch titled add pci_try_set_mwi has been added to the -mm tree. Its filename is add-pci_try_set_mwi-prism54pci.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: add pci_try_set_mwi From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> As suggested by Andrew, add pci_try_set_mwi(), which does not require return-value checking. - add pci_try_set_mwi() without __must_check - make it return 0 on success, errno if the "try" failed or error - review callers Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/wireless/mac80211/p54/prism54pci.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/net/wireless/mac80211/p54/prism54pci.c~add-pci_try_set_mwi-prism54pci drivers/net/wireless/mac80211/p54/prism54pci.c --- a/drivers/net/wireless/mac80211/p54/prism54pci.c~add-pci_try_set_mwi-prism54pci +++ a/drivers/net/wireless/mac80211/p54/prism54pci.c @@ -540,7 +540,7 @@ static int __devinit p54p_probe(struct p } pci_set_master(pdev); - pci_set_mwi(pdev); + pci_try_set_mwi(pdev); pci_write_config_byte(pdev, 0x40, 0); pci_write_config_byte(pdev, 0x41, 0); _ Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are mm-merge-populate-and-nopage-into-fault-fixes-nonlinear.patch romfs-printk-format-warnings.patch add-pci_try_set_mwi.patch git-unionfs.patch add-pci_try_set_mwi-prism54pci.patch git-ipwireless_cs.patch documentation-fix-the-explanation-of-kconfig-files.patch update-dontdiff-file.patch doc-kernel-parameters-use-x86-32-tag-instead-of-ia-32.patch add-kstrndup.patch add-argv_split.patch add-argv_split-fix.patch split-usermodehelper-setup-from-execution.patch add-common-orderly_poweroff.patch add-common-orderly_poweroff-fix.patch tidy-up-usermode-helper-waiting-a-bit.patch profile-likely-unlikely-macros.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html