[SCSI] Merge up to linux-2.6 head

Conflicts:

	drivers/scsi/jazz_esp.c

Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

3 files changed, 19 insertions, 17 deletions

diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index d25d3be8fcd2..165f81d16d00 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 561074a04b03..bc740a6dd93c 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -2423,11 +2423,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 ==
diff --git a/drivers/message/i2o/driver.c b/drivers/message/i2o/driver.c
index d3235f213c89..e0d474b17433 100644
--- a/drivers/message/i2o/driver.c
+++ b/drivers/message/i2o/driver.c
@@ -123,8 +123,12 @@ int i2o_driver_register(struct i2o_driver *drv)
         }
 
         rc = driver_register(&drv->driver);
-        if (rc)
-                destroy_workqueue(drv->event_queue);
+        if (rc) {
+                if (drv->event) {
+                        destroy_workqueue(drv->event_queue);
+                        drv->event_queue = NULL;
+                }
+        }
 
         return rc;
 };
@@ -256,7 +260,7 @@ void i2o_driver_notify_controller_add_all(struct i2o_controller *c)
         int i;
         struct i2o_driver *drv;
 
-        for (i = 0; i < I2O_MAX_DRIVERS; i++) {
+        for (i = 0; i < i2o_max_drivers; i++) {
                 drv = i2o_drivers[i];
 
                 if (drv)
@@ -276,7 +280,7 @@ void i2o_driver_notify_controller_remove_all(struct i2o_controller *c)
         int i;
         struct i2o_driver *drv;
 
-        for (i = 0; i < I2O_MAX_DRIVERS; i++) {
+        for (i = 0; i < i2o_max_drivers; i++) {
                 drv = i2o_drivers[i];
 
                 if (drv)
@@ -295,7 +299,7 @@ void i2o_driver_notify_device_add_all(struct i2o_device *i2o_dev)
         int i;
         struct i2o_driver *drv;
 
-        for (i = 0; i < I2O_MAX_DRIVERS; i++) {
+        for (i = 0; i < i2o_max_drivers; i++) {
                 drv = i2o_drivers[i];
 
                 if (drv)
@@ -314,7 +318,7 @@ void i2o_driver_notify_device_remove_all(struct i2o_device *i2o_dev)
         int i;
         struct i2o_driver *drv;
 
-        for (i = 0; i < I2O_MAX_DRIVERS; i++) {
+        for (i = 0; i < i2o_max_drivers; i++) {
                 drv = i2o_drivers[i];
 
                 if (drv)
@@ -335,17 +339,15 @@ int __init i2o_driver_init(void)
 
         spin_lock_init(&i2o_drivers_lock);
 
-        if ((i2o_max_drivers < 2) || (i2o_max_drivers > 64) ||
-            ((i2o_max_drivers ^ (i2o_max_drivers - 1)) !=
-             (2 * i2o_max_drivers - 1))) {
-                osm_warn("max_drivers set to %d, but must be >=2 and <= 64 and "
-                         "a power of 2\n", i2o_max_drivers);
+        if ((i2o_max_drivers < 2) || (i2o_max_drivers > 64)) {
+                osm_warn("max_drivers set to %d, but must be >=2 and <= 64\n",
+                         i2o_max_drivers);
                 i2o_max_drivers = I2O_MAX_DRIVERS;
         }
         osm_info("max drivers = %d\n", i2o_max_drivers);
 
         i2o_drivers =
-            kzalloc(i2o_max_drivers * sizeof(*i2o_drivers), GFP_KERNEL);
+            kcalloc(i2o_max_drivers, sizeof(*i2o_drivers), GFP_KERNEL);
         if (!i2o_drivers)
                 return -ENOMEM;