The patch titled emu10k1x: simplify around pci_register_driver() has been added to the -mm tree. Its filename is emu10k1x-simplify-around-pci_register_driver.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: emu10k1x: simplify around pci_register_driver() From: Alexey Dobriyan <adobriyan@xxxxxxxxx> Report errors to modprobe as side effect. Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: Jaroslav Kysela <perex@xxxxxxx> Cc: Takashi Iwai <tiwai@xxxxxxx> Cc: James Courtier-Dutton <james@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- sound/pci/emu10k1/emu10k1x.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff -puN sound/pci/emu10k1/emu10k1x.c~emu10k1x-simplify-around-pci_register_driver sound/pci/emu10k1/emu10k1x.c --- a/sound/pci/emu10k1/emu10k1x.c~emu10k1x-simplify-around-pci_register_driver +++ a/sound/pci/emu10k1/emu10k1x.c @@ -1626,12 +1626,7 @@ static struct pci_driver driver = { // initialization of the module static int __init alsa_card_emu10k1x_init(void) { - int err; - - if ((err = pci_register_driver(&driver)) > 0) - return err; - - return 0; + return pci_register_driver(&driver); } // clean up the module _ Patches currently in -mm which might be from adobriyan@xxxxxxxxx are emu10k1x-simplify-around-pci_register_driver.patch git-agpgart.patch config_pm=n-slim-drivers-media-video.patch config_pm=n-slim-drivers-ieee1394-ohci1394c.patch config_pm=n-slim-drivers-scsi-sata_sil.patch config_pm=n-slim-drivers-pcmcia.patch config_pm=n-slim-drivers-serial-8250_pcic.patch megaraid-fix-warnings-when-config_proc_fs=n.patch git-xfs.patch sh-fix-fpn_start-typo.patch headers_check-improve-include-regexp.patch headers_check-clarify-error-message.patch task_struct-ifdef-missedem-v-ipc.patch ifdef-blktrace-debugging-fields.patch tty_ioc-keep-davej-sane.patch ifdef-quota_read-quota_write.patch reiserfs-ifdef-xattr_sem.patch reiserfs-ifdef-acl-stuff-from-inode.patch fsh-ifdef-security-fields.patch config_pm=n-slim-drivers-parport-parport_serialc.patch config_pm=n-slim-sound-oss-tridentc.patch config_pm=n-slim-sound-oss-cs46xxc.patch config_pm=n-slim-drivers-ide-pci-sc1200c.patch documentation-ioctl-messtxt-start-tree-wide-ioctl-registry.patch ioctl-messtxt-xfs-typos.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