Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "Two simple fixes.

  One prevents a soft lockup on some target removal scenarios and the
  other prevents us trying to probe the marvell console device, which
  causes it to time out and need the bus resetting"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: fix soft lockup in scsi_remove_target() on module removal
  SCSI: Add Marvell configuration device to VPD blacklist

2 files changed, 5 insertions, 2 deletions

diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index da2e068ee47d..bbfbfd9e5aa3 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -206,6 +206,7 @@ static struct {
         {"iRiver", "iFP Mass Driver", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36},
         {"LASOUND", "CDX7405", "3.10", BLIST_MAX5LUN | BLIST_SINGLELUN},
         {"Marvell", "Console", NULL, BLIST_SKIP_VPD_PAGES},
+        {"Marvell", "91xx Config", "1.01", BLIST_SKIP_VPD_PAGES},
         {"MATSHITA", "PD-1", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
         {"MATSHITA", "DMC-LC5", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36},
         {"MATSHITA", "DMC-LC40", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36},
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 4f18a851e2c7..00bc7218a7f8 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -1272,16 +1272,18 @@ static void __scsi_remove_target(struct scsi_target *starget)
 void scsi_remove_target(struct device *dev)
 {
         struct Scsi_Host *shost = dev_to_shost(dev->parent);
-        struct scsi_target *starget;
+        struct scsi_target *starget, *last_target = NULL;
         unsigned long flags;
 
 restart:
         spin_lock_irqsave(shost->host_lock, flags);
         list_for_each_entry(starget, &shost->__targets, siblings) {
-                if (starget->state == STARGET_DEL)
+                if (starget->state == STARGET_DEL ||
+                    starget == last_target)
                         continue;
                 if (starget->dev.parent == dev || &starget->dev == dev) {
                         kref_get(&starget->reap_ref);
+                        last_target = starget;
                         spin_unlock_irqrestore(shost->host_lock, flags);
                         __scsi_remove_target(starget);
                         scsi_target_reap(starget);