summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorKai Makisara2009-05-02 07:49:34 +0200
committerJames Bottomley2009-05-23 22:44:06 +0200
commit1da2019fffc65c02a613305919bac28c9bdfaf99 (patch)
tree67f34f8dabd4676a9215e576dc99e1bc5738cf81 /drivers/scsi
parent[SCSI] limit state transitions in scsi_internal_device_unblock (diff)
downloadkernel-qcow2-linux-1da2019fffc65c02a613305919bac28c9bdfaf99.tar.gz
kernel-qcow2-linux-1da2019fffc65c02a613305919bac28c9bdfaf99.tar.xz
kernel-qcow2-linux-1da2019fffc65c02a613305919bac28c9bdfaf99.zip
[SCSI] st: fix gcc 4.4 warning
This patch fixes the GCC 4.4 warning reported by David Binderman and Sergey Senozhatsky. The old version was working correctly but was not easy to read. Signed-off-by: Kai Makisara <kai.makisara@kolumbus.fi> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/st.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index eb24efea8f14..6f46e627aab3 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -2964,7 +2964,7 @@ static int st_int_ioctl(struct scsi_tape *STp, unsigned int cmd_in, unsigned lon
!(STp->use_pf & PF_TESTED)) {
/* Try the other possible state of Page Format if not
already tried */
- STp->use_pf = !STp->use_pf | PF_TESTED;
+ STp->use_pf = (STp->use_pf ^ USE_PF) | PF_TESTED;
st_release_request(SRpnt);
SRpnt = NULL;
return st_int_ioctl(STp, cmd_in, arg);