From: Alan Cox Date: Tue, 4 Sep 2012 14:23:46 +0000 (+0100) Subject: staging: rts_pstor: Fix invalid check X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0ff15d54161cc0e57fed79de1b5731c81225d668;p=openwrt%2Fstaging%2Fblogic.git staging: rts_pstor: Fix invalid check As noted by David Binderman Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=46581 Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rts_pstor/rtsx_scsi.c b/drivers/staging/rts_pstor/rtsx_scsi.c index f2e5842d4c90..936b82ddd4e2 100644 --- a/drivers/staging/rts_pstor/rtsx_scsi.c +++ b/drivers/staging/rts_pstor/rtsx_scsi.c @@ -2482,7 +2482,7 @@ static int spi_vendor_cmd(struct scsi_cmnd *srb, struct rtsx_chip *chip) unsigned int lun = SCSI_LUN(srb); u8 gpio_dir; - if (CHECK_PID(chip, 0x5208) && CHECK_PID(chip, 0x5288)) { + if (CHECK_PID(chip, 0x5208) || CHECK_PID(chip, 0x5288)) { set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD); TRACE_RET(chip, TRANSPORT_FAILED); }