Merge branch 'linus' into xen-64bit

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c
index ed53f14007a2..f2467e936e55 100644
--- a/drivers/scsi/device_handler/scsi_dh_emc.c
+++ b/drivers/scsi/device_handler/scsi_dh_emc.c
@@ -416,12 +416,17 @@ static int clariion_bus_notify(struct notifier_block *nb,
                                 unsigned long action, void *data)
 {
         struct device *dev = data;
-        struct scsi_device *sdev = to_scsi_device(dev);
+        struct scsi_device *sdev;
         struct scsi_dh_data *scsi_dh_data;
         struct clariion_dh_data *h;
         int i, found = 0;
         unsigned long flags;
 
+        if (!scsi_is_sdev_device(dev))
+                return 0;
+
+        sdev = to_scsi_device(dev);
+
         if (action == BUS_NOTIFY_ADD_DEVICE) {
                 for (i = 0; clariion_dev_list[i].vendor; i++) {
                         if (!strncmp(sdev->vendor, clariion_dev_list[i].vendor,