1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index b5bcca36d43c..5440cd050268 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -802,11 +802,12 @@ static int sbp2_update(struct unit_directory *ud)
          */
         sbp2scsi_complete_all_commands(scsi_id, DID_BUS_BUSY);
 
-        /* Make sure we unblock requests (since this is likely after a bus
-         * reset). */
-        atomic_set(&scsi_id->unfinished_reset, 0);
-        scsi_unblock_requests(scsi_id->scsi_host);
-
+        /* Accept new commands unless there was another bus reset in the
+         * meantime. */
+        if (hpsb_node_entry_valid(scsi_id->ne)) {
+                atomic_set(&scsi_id->unfinished_reset, 0);
+                scsi_unblock_requests(scsi_id->scsi_host);
+        }
         return 0;
 }