From 28188df766f4c3d6c3a942052e01ab8a9fc9ec28 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Fri, 17 Aug 2012 14:04:50 -0400 Subject: [PATCH] --- yaml --- r: 328637 b: refs/heads/master c: 3e451a495d6a529d9a01c487f272bb2c4241158f h: refs/heads/master i: 328635: 39332a482279242af56a63998bdc06ef01bb9858 v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-scsi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6b5ec831b5ef..3ffd722773b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91895b786e631ab47b618c901231f22b5a44115b +refs/heads/master: 3e451a495d6a529d9a01c487f272bb2c4241158f diff --git a/trunk/drivers/ata/libata-scsi.c b/trunk/drivers/ata/libata-scsi.c index 8ec81ca8f659..86c2663e00e6 100644 --- a/trunk/drivers/ata/libata-scsi.c +++ b/trunk/drivers/ata/libata-scsi.c @@ -1655,7 +1655,7 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc) if (unlikely(scmd->cmd_len < 10)) goto invalid_fld; scsi_10_lba_len(cdb, &block, &n_block); - if (unlikely(cdb[1] & (1 << 3))) + if (cdb[1] & (1 << 3)) tf_flags |= ATA_TFLAG_FUA; break; case READ_6: @@ -1675,7 +1675,7 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc) if (unlikely(scmd->cmd_len < 16)) goto invalid_fld; scsi_16_lba_len(cdb, &block, &n_block); - if (unlikely(cdb[1] & (1 << 3))) + if (cdb[1] & (1 << 3)) tf_flags |= ATA_TFLAG_FUA; break; default: