[SCSI] Blacklist Traxdata CDR4120 and IOMEGA Zip drive to avoid lock ups.

This patch resulted from the discussion at
https://bugzilla.novell.com/show_bug.cgi?id=679277,
https://bugzilla.novell.com/show_bug.cgi?id=681840 .

Signed-off-by: Werner Fink <werner@novell.com>
Signed-off-by: Ankit Jain <jankit@suse.de>
Cc: stable@kernel.org
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index 82e9e5c0476e..cf8dfab9489f 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -197,6 +197,7 @@ static struct {
         {"IBM", "ProFibre 4000R", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
         {"IBM", "2105", NULL, BLIST_RETRY_HWERROR},
         {"iomega", "jaz 1GB", "J.86", BLIST_NOTQ | BLIST_NOLUN},
+        {"IOMEGA", "ZIP", NULL, BLIST_NOTQ | BLIST_NOLUN},
         {"IOMEGA", "Io20S         *F", NULL, BLIST_KEY},
         {"INSITE", "Floptical   F*8I", NULL, BLIST_KEY},
         {"INSITE", "I325VM", NULL, BLIST_KEY},
@@ -243,6 +244,7 @@ static struct {
         {"Tornado-", "F4", "*", BLIST_NOREPORTLUN},
         {"TOSHIBA", "CDROM", NULL, BLIST_ISROM},
         {"TOSHIBA", "CD-ROM", NULL, BLIST_ISROM},
+        {"Traxdata", "CDR4120", NULL, BLIST_NOLUN},     /* locks up */
         {"USB2.0", "SMARTMEDIA/XD", NULL, BLIST_FORCELUN | BLIST_INQUIRY_36},
         {"WangDAT", "Model 2600", "01.7", BLIST_SELECT_NO_ATN},
         {"WangDAT", "Model 3200", "02.2", BLIST_SELECT_NO_ATN},