Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3d9780b97667fcd63159c0933fdce75465da6c70
Commit:     3d9780b97667fcd63159c0933fdce75465da6c70
Parent:     8fdcf86af61bfba744f5868ec04dad71637ac33a
Author:     Dave Jones <[EMAIL PROTECTED]>
AuthorDate: Mon May 21 20:59:47 2007 -0400
Committer:  James Bottomley <[EMAIL PROTECTED]>
CommitDate: Tue May 22 16:09:21 2007 -0500

    [SCSI] fusion: Fix |/|| confusion
    
    There are several cases where the fusion driver uses the logical || to
    try to do an arithmetical or ... fix by replacing with |.
    
    Signed-off-by: Dave Jones <[EMAIL PROTECTED]>
    Acked-by: "Moore, Eric" <[EMAIL PROTECTED]>
    Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
---
 drivers/message/fusion/mptbase.h  |    2 +-
 drivers/message/fusion/mptscsih.c |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index d25d3be..165f81d 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/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/drivers/message/fusion/mptscsih.c 
b/drivers/message/fusion/mptscsih.c
index fa0f776..3bd94f1 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/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 ==
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to