From 83bee6007e619d54bbe996b88e62dfef18e4a285 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Mon, 21 May 2007 20:59:47 -0400 Subject: [PATCH] --- yaml --- r: 57035 b: refs/heads/master c: 3d9780b97667fcd63159c0933fdce75465da6c70 h: refs/heads/master i: 57033: 986c8eb9e653ac06f58a59cf2a6f694664c538d1 57031: 0f3bd2254d10de14c9ae3fdcc7145e33f923c7f2 v: v3 --- [refs] | 2 +- trunk/drivers/message/fusion/mptbase.h | 2 +- trunk/drivers/message/fusion/mptscsih.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0f7951e15788..eb295822c2c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8fdcf86af61bfba744f5868ec04dad71637ac33a +refs/heads/master: 3d9780b97667fcd63159c0933fdce75465da6c70 diff --git a/trunk/drivers/message/fusion/mptbase.h b/trunk/drivers/message/fusion/mptbase.h index d25d3be8fcd2..165f81d16d00 100644 --- a/trunk/drivers/message/fusion/mptbase.h +++ b/trunk/drivers/message/fusion/mptbase.h @@ -436,7 +436,7 @@ typedef struct _MPT_SAS_MGMT { typedef struct _mpt_ioctl_events { u32 event; /* Specified by define above */ u32 eventContext; /* Index or counter */ - int data[2]; /* First 8 bytes of Event Data */ + u32 data[2]; /* First 8 bytes of Event Data */ } MPT_IOCTL_EVENTS; /* diff --git a/trunk/drivers/message/fusion/mptscsih.c b/trunk/drivers/message/fusion/mptscsih.c index fa0f7761652a..3bd94f11e7d6 100644 --- a/trunk/drivers/message/fusion/mptscsih.c +++ b/trunk/drivers/message/fusion/mptscsih.c @@ -2463,11 +2463,11 @@ mptscsih_copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR 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]; + ioc->events[idx].data[1] = (sense_data[13] << 8) | sense_data[12]; ioc->eventContext++; if (hd->ioc->pcidev->vendor ==