diff options
author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-07-21 19:34:47 +0200 |
---|---|---|
committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-07-21 19:34:47 +0200 |
commit | a2952398e5de8746a761a59686619d08d376bce3 (patch) | |
tree | df2373bb1119468873c667624769455c36dc3786 /linux/src/drivers/scsi/NCR5380.c | |
parent | ba1b3afd50913473f3036a63b4a82d7ba5c42009 (diff) | |
parent | 92e98a7f4d4fa75b286a067e1d1caef514fccb0d (diff) |
Merge branch 'master' into master-gdb_stubs
Diffstat (limited to 'linux/src/drivers/scsi/NCR5380.c')
-rw-r--r-- | linux/src/drivers/scsi/NCR5380.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/src/drivers/scsi/NCR5380.c b/linux/src/drivers/scsi/NCR5380.c index 295f2ad2..4f085e9b 100644 --- a/linux/src/drivers/scsi/NCR5380.c +++ b/linux/src/drivers/scsi/NCR5380.c @@ -1949,7 +1949,7 @@ static int do_abort (struct Scsi_Host *host) { * the target sees, so we just handshake. */ - while (!(tmp = NCR5380_read(STATUS_REG)) & SR_REQ); + while (!((tmp = NCR5380_read(STATUS_REG)) & SR_REQ)); NCR5380_write(TARGET_COMMAND_REG, PHASE_SR_TO_TCR(tmp)); @@ -2900,7 +2900,7 @@ static void NCR5380_reselect (struct Scsi_Host *instance) { NCR5380_transfer_pio(instance, &phase, &len, &data); - if (!msg[0] & 0x80) { + if (!(msg[0] & 0x80)) { printk("scsi%d : expecting IDENTIFY message, got ", instance->host_no); print_msg(msg); |