From: Stefan Richter Date: Thu, 2 Nov 2006 20:16:08 +0000 (+0100) Subject: ieee1394: sbp2: remove duplicate code X-Git-Tag: v2.6.20-rc1~34^2~412^2^2~29 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0b885449ac6fab42cd6808c9ea8d6e456e0e65b7;p=linux-2.6-omap-h63xx.git 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 --- diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 2b3099477e9..38abf032540 100644 --- 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 */