Merge branch 'master'

3 files changed, 41 insertions, 5 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index e2845b442776..9c9f162bd6ed 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -569,6 +569,11 @@ config SCSI_SATA_VITESSE
 
           If unsure, say N.
 
+config SCSI_SATA_INTEL_COMBINED
+        bool
+        depends on IDE=y && !BLK_DEV_IDE_SATA && (SCSI_SATA_AHCI || SCSI_ATA_PIIX)
+        default y
+
 config SCSI_BUSLOGIC
         tristate "BusLogic SCSI support"
         depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index de8490a92831..a1f9ceef0ac9 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -453,9 +453,9 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
                 /*
                  * We can exit If all the commands are complete
                  */
+                spin_unlock_irq(host->host_lock);
                 if (active == 0)
                         return SUCCESS;
-                spin_unlock_irq(host->host_lock);
                 ssleep(1);
                 spin_lock_irq(host->host_lock);
         }
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index a917ab7475ac..1fd5fc6d0fe3 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -1119,6 +1119,36 @@ static inline void update_can_queue(struct Scsi_Host *host, u_int in_ptr, u_int
         host->sg_tablesize = QLOGICPTI_MAX_SG(num_free);
 }
 
+static unsigned int scsi_rbuf_get(struct scsi_cmnd *cmd, unsigned char **buf_out)
+{
+        unsigned char *buf;
+        unsigned int buflen;
+
+        if (cmd->use_sg) {
+                struct scatterlist *sg;
+
+                sg = (struct scatterlist *) cmd->request_buffer;
+                buf = kmap_atomic(sg->page, KM_IRQ0) + sg->offset;
+                buflen = sg->length;
+        } else {
+                buf = cmd->request_buffer;
+                buflen = cmd->request_bufflen;
+        }
+
+        *buf_out = buf;
+        return buflen;
+}
+
+static void scsi_rbuf_put(struct scsi_cmnd *cmd, unsigned char *buf)
+{
+        if (cmd->use_sg) {
+                struct scatterlist *sg;
+
+                sg = (struct scatterlist *) cmd->request_buffer;
+                kunmap_atomic(buf - sg->offset, KM_IRQ0);
+        }
+}
+
 /*
  * Until we scan the entire bus with inquiries, go throught this fella...
  */
@@ -1145,11 +1175,9 @@ static void ourdone(struct scsi_cmnd *Cmnd)
                 int ok = host_byte(Cmnd->result) == DID_OK;
                 if (Cmnd->cmnd[0] == 0x12 && ok) {
                         unsigned char *iqd;
+                        unsigned int iqd_len;
 
-                        if (Cmnd->use_sg != 0)
-                                BUG();
-
-                        iqd = ((unsigned char *)Cmnd->buffer);
+                        iqd_len = scsi_rbuf_get(Cmnd, &iqd);
 
                         /* tags handled in midlayer */
                         /* enable sync mode? */
@@ -1163,6 +1191,9 @@ static void ourdone(struct scsi_cmnd *Cmnd)
                         if (iqd[7] & 0x20) {
                                 qpti->dev_param[tgt].device_flags |= 0x20;
                         }
+
+                        scsi_rbuf_put(Cmnd, iqd);
+
                         qpti->sbits |= (1 << tgt);
                 } else if (!ok) {
                         qpti->sbits |= (1 << tgt);