Merge with mainline to remove plat-omap/Kconfig conflict

Conflicts:
	arch/arm/plat-omap/Kconfig

1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index 55b034b72708..1d7a8780e00c 100644
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -448,13 +448,17 @@ static void ses_match_to_enclosure(struct enclosure_device *edev,
                 .addr = 0,
         };
 
-        buf = scsi_get_vpd_page(sdev, 0x83);
-        if (!buf)
-                return;
+        buf = kmalloc(INIT_ALLOC_SIZE, GFP_KERNEL);
+        if (!buf || scsi_get_vpd_page(sdev, 0x83, buf, INIT_ALLOC_SIZE))
+                goto free;
 
         ses_enclosure_data_process(edev, to_scsi_device(edev->edev.parent), 0);
 
         vpd_len = ((buf[2] << 8) | buf[3]) + 4;
+        kfree(buf);
+        buf = kmalloc(vpd_len, GFP_KERNEL);
+        if (!buf ||scsi_get_vpd_page(sdev, 0x83, buf, vpd_len))
+                goto free;
 
         desc = buf + 4;
         while (desc < buf + vpd_len) {