The patch titled
Fix |/|| confusion in fusion driver (update)
has been removed from the -mm tree. Its filename was
fix-confusion-in-fusion-driver-update.patch
This patch was dropped because it was folded into fix--confusion-in-fusion-driver.patch
------------------------------------------------------
Subject: Fix |/|| confusion in fusion driver (update)
From: Dave Jones <davej@xxxxxxxxxx>
The last time this was posted, Eric picked up on some other flaws in the
same area. James asked him to followup with a patch, but unless I'm
mistaken, that never arrived. This diff should replace the one in your
tree until Eric has an equivalent or better.
Signed-off-by: Dave Jones <davej@xxxxxxxxxx>
Cc: Eric Moore <eric.moore@xxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/message/fusion/mptbase.h | 2 +-
drivers/message/fusion/mptscsih.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/message/fusion/mptbase.h~fix-confusion-in-fusion-driver-update drivers/message/fusion/mptbase.h
--- a/drivers/message/fusion/mptbase.h~fix-confusion-in-fusion-driver-update
+++ a/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 -puN drivers/message/fusion/mptscsih.c~fix-confusion-in-fusion-driver-update drivers/message/fusion/mptscsih.c
--- a/drivers/message/fusion/mptscsih.c~fix-confusion-in-fusion-driver-update
+++ a/drivers/message/fusion/mptscsih.c
@@ -2467,7 +2467,7 @@ mptscsih_copy_sense_data(struct scsi_cmn
(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 ==
_
Patches currently in -mm which might be from davej@xxxxxxxxxx are
origin.patch
git-cpufreq.patch
ide-add-seagate-stt20000a-to-dma-blacklist.patch
fix--confusion-in-fusion-driver.patch
fix-confusion-in-fusion-driver-update.patch
fix-up-codingstyle-in-isofs.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
