]> err.no Git - linux-2.6/blobdiff - drivers/scsi/device_handler/scsi_dh_emc.c
Merge branch 'linus' into x86/paravirt-spinlocks
[linux-2.6] / drivers / scsi / device_handler / scsi_dh_emc.c
index ed53f14007a2107621441357eb2396b473ec62d1..f2467e936e554ea703c60621d42e3dceeaf6760f 100644 (file)
@@ -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,