Date: Thu, 2 Nov 2006 21:16:08 +0100 (CET) From: Stefan Richter Subject: 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 --- drivers/ieee1394/sbp2.c | 11 ----------- 1 files changed, 11 deletions(-) Index: linux/drivers/ieee1394/sbp2.c =================================================================== --- linux.orig/drivers/ieee1394/sbp2.c 2006-10-31 19:46:41.000000000 +0100 +++ linux/drivers/ieee1394/sbp2.c 2006-10-31 19:49:42.000000000 +0100 @@ -2480,17 +2480,6 @@ static void sbp2scsi_complete_command(st } /* - * 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 */ switch (scsi_status) {