mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
[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 <davej@redhat.com> Acked-by: "Moore, Eric" <Eric.Moore@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
parent
8fdcf86af6
commit
3d9780b976
2 changed files with 5 additions and 5 deletions
|
@ -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;
|
||||
|
||||
/*
|
||||
|
|
|
@ -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 ==
|
||||
|
|
Loading…
Reference in a new issue