Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139...

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

diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
index 0f86a18b157de47dc7dd8028ee727aa7d56a8b18..084062bb8ee9de341ded2d0bb2d1b4b2ea897ecb 100644 (file)
--- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c
+++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
@@ -320,6 +320,24 @@ static const struct scsi_dh_devlist hp_sw_dh_data_list[] = {
        {NULL, NULL},
 };
 
+static bool hp_sw_match(struct scsi_device *sdev)
+{
+       int i;
+
+       if (scsi_device_tpgs(sdev))
+               return false;
+
+       for (i = 0; hp_sw_dh_data_list[i].vendor; i++) {
+               if (!strncmp(sdev->vendor, hp_sw_dh_data_list[i].vendor,
+                       strlen(hp_sw_dh_data_list[i].vendor)) &&
+                   !strncmp(sdev->model, hp_sw_dh_data_list[i].model,
+                       strlen(hp_sw_dh_data_list[i].model))) {
+                       return true;
+               }
+       }
+       return false;
+}
+
 static int hp_sw_bus_attach(struct scsi_device *sdev);
 static void hp_sw_bus_detach(struct scsi_device *sdev);
 
@@ -331,6 +349,7 @@ static struct scsi_device_handler hp_sw_dh = {
        .detach         = hp_sw_bus_detach,
        .activate       = hp_sw_activate,
        .prep_fn        = hp_sw_prep_fn,
+       .match          = hp_sw_match,
 };
 
 static int hp_sw_bus_attach(struct scsi_device *sdev)