The patch titled drivers/infiniband/hw/amso1100/c2_rnic.c: fix a NULL dereference has been removed from the -mm tree. Its filename is drivers-infiniband-hw-amso1100-c2_rnicc-fix-a-null-dereference.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: drivers/infiniband/hw/amso1100/c2_rnic.c: fix a NULL dereference From: Adrian Bunk <bunk@xxxxxxxxx> This patch fixes a NULL dereference spotted by the Coverity checker. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/infiniband/hw/amso1100/c2_rnic.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/infiniband/hw/amso1100/c2_rnic.c~drivers-infiniband-hw-amso1100-c2_rnicc-fix-a-null-dereference drivers/infiniband/hw/amso1100/c2_rnic.c --- a/drivers/infiniband/hw/amso1100/c2_rnic.c~drivers-infiniband-hw-amso1100-c2_rnicc-fix-a-null-dereference +++ a/drivers/infiniband/hw/amso1100/c2_rnic.c @@ -150,8 +150,8 @@ static int c2_rnic_query(struct c2_dev * (struct c2wr_rnic_query_rep *) (unsigned long) (vq_req->reply_msg); if (!reply) err = -ENOMEM; - - err = c2_errno(reply); + else + err = c2_errno(reply); if (err) goto bail2; _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch w1-kconfig-fix.patch git-gfs2.patch git-infiniband.patch ata-must-depend-on-block.patch git-mtd.patch git-pcmcia.patch drivers-net-pcmcia-xirc2ps_csc-remove-unused-label.patch drivers-scsi-aic7xxx-possible-cleanups.patch drivers-scsi-small-cleanups.patch drivers-scsi-qla2xxx-make-some-functions-static.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-advansysc-cleanups.patch make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch megaraid-fix-warnings-when-config_proc_fs=n.patch drivers-scsi-dpt_i2oc-remove-dead-code.patch drivers-usb-misc-ftdi-elanc-remove-dead-code.patch drivers-usb-serial-mos7840c-fix-a-check-after-dereference.patch acx1xx-wireless-driver.patch drivers-edac-make-code-static.patch ht_irq-must-depend-on-pci.patch fs-reiser4-possible-cleanups.patch reiser4-possible-cleanups-2.patch slab-cache-shrinker-statistics.patch debug-shared-irqs-kconfig-fix.patch i386-enable-4k-stacks-by-default.patch mutex-subsystem-synchro-test-module.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