Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel

Conflicts:

	arch/arm/mach-at91/gpio.c

3 files changed, 13 insertions, 5 deletions

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index a1a511bdec8c..ed1e728763a2 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -1573,9 +1573,6 @@ static int ibmvfc_queuecommand(struct scsi_cmnd *cmnd,
         vfc_cmd->resp_len = sizeof(vfc_cmd->rsp);
         vfc_cmd->cancel_key = (unsigned long)cmnd->device->hostdata;
         vfc_cmd->tgt_scsi_id = rport->port_id;
-        if ((rport->supported_classes & FC_COS_CLASS3) &&
-            (fc_host_supported_classes(vhost->host) & FC_COS_CLASS3))
-                vfc_cmd->flags = IBMVFC_CLASS_3_ERR;
         vfc_cmd->iu.xfer_len = scsi_bufflen(cmnd);
         int_to_scsilun(cmnd->device->lun, &vfc_cmd->iu.lun);
         memcpy(vfc_cmd->iu.cdb, cmnd->cmnd, cmnd->cmd_len);
@@ -3266,6 +3263,7 @@ static int ibmvfc_alloc_target(struct ibmvfc_host *vhost, u64 scsi_id)
                 return -ENOMEM;
         }
 
+        memset(tgt, 0, sizeof(*tgt));
         tgt->scsi_id = scsi_id;
         tgt->new_scsi_id = scsi_id;
         tgt->vhost = vhost;
@@ -3576,9 +3574,18 @@ static void ibmvfc_log_ae(struct ibmvfc_host *vhost, int events)
 static void ibmvfc_tgt_add_rport(struct ibmvfc_target *tgt)
 {
         struct ibmvfc_host *vhost = tgt->vhost;
-        struct fc_rport *rport;
+        struct fc_rport *rport = tgt->rport;
         unsigned long flags;
 
+        if (rport) {
+                tgt_dbg(tgt, "Setting rport roles\n");
+                fc_remote_port_rolechg(rport, tgt->ids.roles);
+                spin_lock_irqsave(vhost->host->host_lock, flags);
+                ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_NONE);
+                spin_unlock_irqrestore(vhost->host->host_lock, flags);
+                return;
+        }
+
         tgt_dbg(tgt, "Adding rport\n");
         rport = fc_remote_port_add(vhost->host, 0, &tgt->ids);
         spin_lock_irqsave(vhost->host->host_lock, flags);
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h
index 87dafd0f8d44..b21e071b9862 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.h
+++ b/drivers/scsi/ibmvscsi/ibmvfc.h
@@ -32,7 +32,7 @@
 #define IBMVFC_DRIVER_VERSION           "1.0.4"
 #define IBMVFC_DRIVER_DATE              "(November 14, 2008)"
 
-#define IBMVFC_DEFAULT_TIMEOUT  15
+#define IBMVFC_DEFAULT_TIMEOUT  60
 #define IBMVFC_INIT_TIMEOUT             120
 #define IBMVFC_MAX_REQUESTS_DEFAULT     100
 
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 74d07d137dae..c9aa7611e408 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -432,6 +432,7 @@ static int map_sg_data(struct scsi_cmnd *cmd,
                                 sdev_printk(KERN_ERR, cmd->device,
                                             "Can't allocate memory "
                                             "for indirect table\n");
+                        scsi_dma_unmap(cmd);
                         return 0;
                 }
         }