From: Dirk Mueller <[EMAIL PROTECTED]>
This patch corrects a |/|| confusion in mptscsih_copy_sense_data. Using ||
means that the data that ends up being written is (almost always) 1,
instead of being bit-wise or'ed.
Cc: Eric Moore <[EMAIL PROTECTED]>
Cc: James Bottomley <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/message/fusion/mptscsih.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/message/fusion/mptscsih.c~fix--confusion-in-fusion-driver
drivers/message/fusion/mptscsih.c
--- a/drivers/message/fusion/mptscsih.c~fix--confusion-in-fusion-driver
+++ a/drivers/message/fusion/mptscsih.c
@@ -2463,9 +2463,9 @@ mptscsih_copy_sense_data(struct scsi_cmn
ioc->events[idx].event =
MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE;
ioc->events[idx].eventContext =
ioc->eventContext;
- ioc->events[idx].data[0] = (pReq->LUN[1] << 24)
||
- (MPI_EVENT_SCSI_DEV_STAT_RC_SMART_DATA
<< 16) ||
- (sc->device->channel << 8) ||
sc->device->id;
+ ioc->events[idx].data[0] = (pReq->LUN[1] << 24)
|
+ (MPI_EVENT_SCSI_DEV_STAT_RC_SMART_DATA
<< 16) |
+ (sc->device->channel << 8) |
sc->device->id;
ioc->events[idx].data[1] = (sense_data[13] <<
8) || sense_data[12];
_
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
