Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

6 files changed, 34 insertions, 14 deletions

diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
index da876d3924be..a48e4990fe12 100644
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -25,7 +25,6 @@
 #include <linux/delay.h>
 #include <linux/timer.h>
 #include <linux/spinlock.h>
-#include <linux/hdreg.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/div64.h>
@@ -1249,6 +1248,13 @@ static struct pci_device_id hptiop_id_table[] = {
         { PCI_VDEVICE(TTI, 0x3522), (kernel_ulong_t)&hptiop_itl_ops },
         { PCI_VDEVICE(TTI, 0x3410), (kernel_ulong_t)&hptiop_itl_ops },
         { PCI_VDEVICE(TTI, 0x3540), (kernel_ulong_t)&hptiop_itl_ops },
+        { PCI_VDEVICE(TTI, 0x3530), (kernel_ulong_t)&hptiop_itl_ops },
+        { PCI_VDEVICE(TTI, 0x3560), (kernel_ulong_t)&hptiop_itl_ops },
+        { PCI_VDEVICE(TTI, 0x4322), (kernel_ulong_t)&hptiop_itl_ops },
+        { PCI_VDEVICE(TTI, 0x4210), (kernel_ulong_t)&hptiop_itl_ops },
+        { PCI_VDEVICE(TTI, 0x4211), (kernel_ulong_t)&hptiop_itl_ops },
+        { PCI_VDEVICE(TTI, 0x4310), (kernel_ulong_t)&hptiop_itl_ops },
+        { PCI_VDEVICE(TTI, 0x4311), (kernel_ulong_t)&hptiop_itl_ops },
         { PCI_VDEVICE(TTI, 0x3120), (kernel_ulong_t)&hptiop_mv_ops },
         { PCI_VDEVICE(TTI, 0x3122), (kernel_ulong_t)&hptiop_mv_ops },
         { PCI_VDEVICE(TTI, 0x3020), (kernel_ulong_t)&hptiop_mv_ops },
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index b40a673985aa..461331d3dc45 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -102,11 +102,10 @@ static struct ide_scsi_obj *ide_scsi_get(struct gendisk *disk)
         mutex_lock(&idescsi_ref_mutex);
         scsi = ide_scsi_g(disk);
         if (scsi) {
-                scsi_host_get(scsi->host);
-                if (ide_device_get(scsi->drive)) {
-                        scsi_host_put(scsi->host);
+                if (ide_device_get(scsi->drive))
                         scsi = NULL;
-                }
+                else
+                        scsi_host_get(scsi->host);
         }
         mutex_unlock(&idescsi_ref_mutex);
         return scsi;
@@ -114,9 +113,11 @@ static struct ide_scsi_obj *ide_scsi_get(struct gendisk *disk)
 
 static void ide_scsi_put(struct ide_scsi_obj *scsi)
 {
+        ide_drive_t *drive = scsi->drive;
+
         mutex_lock(&idescsi_ref_mutex);
-        ide_device_put(scsi->drive);
         scsi_host_put(scsi->host);
+        ide_device_put(drive);
         mutex_unlock(&idescsi_ref_mutex);
 }
 
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 7a4409ab30ea..a319a20ed440 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -8,6 +8,7 @@
 
 #include <linux/kthread.h>
 #include <linux/vmalloc.h>
+#include <linux/delay.h>
 
 static int qla24xx_vport_disable(struct fc_vport *, bool);
 
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index 75a64a6cae8c..b29360ed0bdc 100644
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -366,12 +366,14 @@ spi_transport_rd_attr(rti, "%d\n");
 spi_transport_rd_attr(pcomp_en, "%d\n");
 spi_transport_rd_attr(hold_mcs, "%d\n");
 
-/* we only care about the first child device so we return 1 */
+/* we only care about the first child device that's a real SCSI device
+ * so we return 1 to terminate the iteration when we find it */
 static int child_iter(struct device *dev, void *data)
 {
-        struct scsi_device *sdev = to_scsi_device(dev);
+        if (!scsi_is_sdev_device(dev))
+                return 0;
 
-        spi_dv_device(sdev);
+        spi_dv_device(to_scsi_device(dev));
         return 1;
 }
 
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index 0fe031f003e7..1bcf3c33d7ff 100644
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -345,14 +345,14 @@ static int ses_enclosure_find_by_addr(struct enclosure_device *edev,
         return 0;
 }
 
-#define VPD_INQUIRY_SIZE 512
+#define VPD_INQUIRY_SIZE 36
 
 static void ses_match_to_enclosure(struct enclosure_device *edev,
                                    struct scsi_device *sdev)
 {
         unsigned char *buf = kmalloc(VPD_INQUIRY_SIZE, GFP_KERNEL);
         unsigned char *desc;
-        int len;
+        u16 vpd_len;
         struct efd efd = {
                 .addr = 0,
         };
@@ -372,9 +372,19 @@ static void ses_match_to_enclosure(struct enclosure_device *edev,
                              VPD_INQUIRY_SIZE, NULL, SES_TIMEOUT, SES_RETRIES))
                 goto free;
 
-        len = (buf[2] << 8) + buf[3];
+        vpd_len = (buf[2] << 8) + buf[3];
+        kfree(buf);
+        buf = kmalloc(vpd_len, GFP_KERNEL);
+        if (!buf)
+                return;
+        cmd[3] = vpd_len >> 8;
+        cmd[4] = vpd_len & 0xff;
+        if (scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buf,
+                             vpd_len, NULL, SES_TIMEOUT, SES_RETRIES))
+                goto free;
+
         desc = buf + 4;
-        while (desc < buf + len) {
+        while (desc < buf + vpd_len) {
                 enum scsi_protocol proto = desc[0] >> 4;
                 u8 code_set = desc[0] & 0x0f;
                 u8 piv = desc[1] & 0x80;
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index d3b8ebb83776..3d36270a8b4d 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1747,7 +1747,7 @@ st_map_user_pages(struct scatterlist *sgl, const unsigned int max_pages,
                  */
                 flush_dcache_page(pages[i]);
                 /* ?? Is locking needed? I don't think so */
-                /* if (TestSetPageLocked(pages[i]))
+                /* if (!trylock_page(pages[i]))
                    goto out_unlock; */
         }