ieee1394: sbp2: remove duplicate code

The same case is handled further below in sbp2scsi_complete_command.
Note, the second version behaves slightly different but looks
preferable.  It's an extremely unlikely case by the way.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 2b3099477e99921b066497c2f4beefacf262b97e..38abf0325403ce18e9529696bc3ecf431573427a 100644 (file)
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -2483,17 +2483,6 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id,
                return;
        }
 
-       /*
-        * If a bus reset is in progress and there was an error, don't
-        * complete the command, just let it get retried at the end of the
-        * bus reset.
-        */
-       if (!hpsb_node_entry_valid(scsi_id->ne)
-           && (scsi_status != SBP2_SCSI_STATUS_GOOD)) {
-               SBP2_ERR("Bus reset in progress - retry command later");
-               return;
-       }
-
        /*
         * Switch on scsi status
         */