1 files changed, 8 insertions, 18 deletions

diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c
index 20c4557f5abd..69c915aa77c2 100644
--- a/drivers/scsi/device_handler/scsi_dh_rdac.c
+++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
@@ -790,29 +790,19 @@ static const struct scsi_dh_devlist rdac_dev_list[] = {
         {"IBM", "1815"},
         {"IBM", "1818"},
         {"IBM", "3526"},
-        {"SGI", "TP9400"},
-        {"SGI", "TP9500"},
-        {"SGI", "TP9700"},
+        {"SGI", "TP9"},
         {"SGI", "IS"},
         {"STK", "OPENstorage D280"},
-        {"SUN", "CSM200_R"},
-        {"SUN", "LCSM100_I"},
-        {"SUN", "LCSM100_S"},
-        {"SUN", "LCSM100_E"},
-        {"SUN", "LCSM100_F"},
-        {"DELL", "MD3000"},
-        {"DELL", "MD3000i"},
-        {"DELL", "MD32xx"},
-        {"DELL", "MD32xxi"},
-        {"DELL", "MD36xxi"},
-        {"DELL", "MD36xxf"},
-        {"LSI", "INF-01-00"},
-        {"ENGENIO", "INF-01-00"},
         {"STK", "FLEXLINE 380"},
-        {"SUN", "CSM100_R_FC"},
+        {"SUN", "CSM"},
+        {"SUN", "LCSM100"},
         {"SUN", "STK6580_6780"},
         {"SUN", "SUN_6180"},
         {"SUN", "ArrayStorage"},
+        {"DELL", "MD3"},
+        {"NETAPP", "INF-01-00"},
+        {"LSI", "INF-01-00"},
+        {"ENGENIO", "INF-01-00"},
         {NULL, NULL},
 };
 
@@ -863,7 +853,7 @@ static int rdac_bus_attach(struct scsi_device *sdev)
         if (!scsi_dh_data) {
                 sdev_printk(KERN_ERR, sdev, "%s: Attach failed\n",
                             RDAC_NAME);
-                return 0;
+                return -ENOMEM;
         }
 
         scsi_dh_data->scsi_dh = &rdac_dh;