]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
UBUNTU: SAUCE: Ibmvscsis: Fixed a bug reported by Dan Carpenter
authorBryant G. Ly <bryantly@linux.vnet.ibm.com>
Thu, 1 Sep 2016 18:50:33 +0000 (12:50 -0600)
committerTim Gardner <tim.gardner@canonical.com>
Wed, 14 Sep 2016 12:44:05 +0000 (06:44 -0600)
BugLink: http://bugs.launchpad.net/bugs/1615665
SUPPORTED_FORMATS is 1 << 1 so it's never zero.

Signed-off-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com>
Signed-off-by: Michael Cyr <mikecyr@linux.vnet.ibm.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Acked-by: Kamal Mostafa <kamal@canonical.com>
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c

index d4c67b98fa5f8f6d9ef25a4c854b6e218147ae2d..35455af3be232108b0241fb1c6f386597496bd5d 100644 (file)
@@ -1978,7 +1978,7 @@ static long ibmvscsis_srp_login(struct scsi_info *vscsi,
                reason = SRP_LOGIN_REJ_MULTI_CHANNEL_UNSUPPORTED;
        else if (fmt->buffers & (~SUPPORTED_FORMATS))
                reason = SRP_LOGIN_REJ_UNSUPPORTED_DESCRIPTOR_FMT;
-       else if ((fmt->buffers | SUPPORTED_FORMATS) == 0)
+       else if ((fmt->buffers & SUPPORTED_FORMATS) == 0)
                reason = SRP_LOGIN_REJ_UNSUPPORTED_DESCRIPTOR_FMT;
 
        if (vscsi->state == SRP_PROCESSING)