On Tue, 2007-05-08 at 11:06 -0600, Moore, Eric wrote:
> On Thursday, April 26, 2007 1:35 AM, Dirk Mueller wrote:
>
> >
> > 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 <eric.moore@xxxxxxx>
> > Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> > ---
> >
> > drivers/message/fusion/mptscsih.c | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff -puN
> > drivers/message/fusion/mptscsih.c~fix--confusion-in-fusion-dri
> > ver 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];
> >
>
>
> Thanks, I agree with the change, however shouldn't we be changing:
>
> > ioc->events[idx].data[1] = > (sense_data[13] << 8) || sense_data[12];
> >
>
> to
>
> > ioc->events[idx].data[1] = > (sense_data[13] << 8) | sense_data[12];
> >
>
>
> And in the mptbase.h, the definition of the struct should be changed
> from
>
> > 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
> */
> > } MPT_IOCTL_EVENTS;
>
> to
>
> > typedef struct _mpt_ioctl_events {
> > u32 event; /* Specified by define above */
> > u32 eventContext; /* Index or counter */
> > u32 data[2]; /* First 8 bytes of Event Data
> */
> > } MPT_IOCTL_EVENTS;
Probably ... could you update the patch accordingly and send it in?
James
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
