The patch titled mpt2sas: fix &&/|| confusion in _scsih_sas_device_status_change_event() has been added to the -mm tree. Its filename is mpt2sas-fix-confusion-in-_scsih_sas_device_status_change_event.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mpt2sas: fix &&/|| confusion in _scsih_sas_device_status_change_event() From: Roel Kluin <roel.kluin@xxxxxxxxx> Even if the ReasonCode is not INTERNAL_DEVICE_RESET nor CMP_DEVICE_RESET this still evaluates to true. Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx> Cc: James E.J. Bottomley <James.Bottomley@xxxxxxx> Cc: Kashyap Desai <kashyap.desai@xxxxxxx> Cc: Eric Moore <Eric.moore@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/scsi/mpt2sas/mpt2sas_scsih.c~mpt2sas-fix-confusion-in-_scsih_sas_device_status_change_event drivers/scsi/mpt2sas/mpt2sas_scsih.c --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c~mpt2sas-fix-confusion-in-_scsih_sas_device_status_change_event +++ a/drivers/scsi/mpt2sas/mpt2sas_scsih.c @@ -4362,10 +4362,10 @@ _scsih_sas_device_status_change_event(st event_data); #endif - if (!(event_data->ReasonCode == - MPI2_EVENT_SAS_DEV_STAT_RC_INTERNAL_DEVICE_RESET && - event_data->ReasonCode == - MPI2_EVENT_SAS_DEV_STAT_RC_CMP_INTERNAL_DEV_RESET)) + if (event_data->ReasonCode != + MPI2_EVENT_SAS_DEV_STAT_RC_INTERNAL_DEVICE_RESET && + event_data->ReasonCode != + MPI2_EVENT_SAS_DEV_STAT_RC_CMP_INTERNAL_DEV_RESET) return; spin_lock_irqsave(&ioc->sas_device_lock, flags); _ Patches currently in -mm which might be from roel.kluin@xxxxxxxxx are origin.patch linux-next.patch acpi-fix-confusion-in-acpi_evaluate_string-in-comment.patch powerpc-sky-cpu-redundant-or-incorrect-tests-on-unsigned.patch v4l-dvb-wrong-variable-tested.patch hisax-timeout-off-by-one-in-waitrecmsg.patch drivers-scsi-fnic-fnic_scsic-clean-up.patch ibmmca-buffer-overflow.patch scsi-eata-fix-buffer-overflow.patch drivers-scsi-gdthc-fix-buffer-overflow.patch drivers-scsi-u14-34fc-fix-uffer-overflow.patch drivers-scsi-lpfc-lpfc_vportc-fix-read-buffer-overflow.patch osst-fix-read-buffer-overflow.patch gdth-unmap-ccb_phys-when-scsi_add_host-fails-in-gdth_eisa_probe_one.patch zfcp-test-kmalloc-failure-in-scsi_get_vpd_page.patch ncr5380-bit-mr_dma_mode-set-twice-in-ncr5380_transfer_dma.patch scsi-pmcraid-redundant-check-in-pmcraid_check_ioctl_buffer.patch dc395x-decrease-iteration-for-tag_number-of-max_command-in-start_scsi.patch mpt2sas-fix-confusion-in-_scsih_sas_device_status_change_event.patch paride-fix-off-by-one-test.patch 80211core-fix-confusion.patch frv-duplicate-output_buffer-of-e03.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch cryptocop-fix-assertion-in-create_output_descriptors.patch asiliantfb-fix-test-of-unsigned-in-asiliant_calc_dclk2.patch w1-fix-test-in-ds2482_wait_1wire_idle.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