Merge tag 'spi-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc

[~andy/linux] / drivers / scsi / device_handler / scsi_dh_emc.c

diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c
index 591186cf1896abbd0031e4a2bd45682e2b6d5191..e1c8be06de9de2f50dd608f0ec27f7bf81617adb 100644 (file)
--- a/drivers/scsi/device_handler/scsi_dh_emc.c
+++ b/drivers/scsi/device_handler/scsi_dh_emc.c
@@ -629,6 +629,24 @@ static const struct scsi_dh_devlist clariion_dev_list[] = {
        {NULL, NULL},
 };
 
+static bool clariion_match(struct scsi_device *sdev)
+{
+       int i;
+
+       if (scsi_device_tpgs(sdev))
+               return false;
+
+       for (i = 0; clariion_dev_list[i].vendor; i++) {
+               if (!strncmp(sdev->vendor, clariion_dev_list[i].vendor,
+                       strlen(clariion_dev_list[i].vendor)) &&
+                   !strncmp(sdev->model, clariion_dev_list[i].model,
+                       strlen(clariion_dev_list[i].model))) {
+                       return true;
+               }
+       }
+       return false;
+}
+
 static int clariion_bus_attach(struct scsi_device *sdev);
 static void clariion_bus_detach(struct scsi_device *sdev);
 
@@ -642,6 +660,7 @@ static struct scsi_device_handler clariion_dh = {
        .activate       = clariion_activate,
        .prep_fn        = clariion_prep_fn,
        .set_params     = clariion_set_params,
+       .match          = clariion_match,
 };
 
 static int clariion_bus_attach(struct scsi_device *sdev)