diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-11-02 15:16:08 -0500 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-12-07 15:46:30 -0500 |
commit | 0b885449ac6fab42cd6808c9ea8d6e456e0e65b7 (patch) | |
tree | c380c1c2eb06f647bc77a8c53a76672c92869e74 | |
parent | 8c8009e69b31c60e875a348c1b032ed9543d1df6 (diff) |
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>
-rw-r--r-- | drivers/ieee1394/sbp2.c | 11 |
1 files changed, 0 insertions, 11 deletions
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 | |||
@@ -2484,17 +2484,6 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id, | |||
2484 | } | 2484 | } |
2485 | 2485 | ||
2486 | /* | 2486 | /* |
2487 | * If a bus reset is in progress and there was an error, don't | ||
2488 | * complete the command, just let it get retried at the end of the | ||
2489 | * bus reset. | ||
2490 | */ | ||
2491 | if (!hpsb_node_entry_valid(scsi_id->ne) | ||
2492 | && (scsi_status != SBP2_SCSI_STATUS_GOOD)) { | ||
2493 | SBP2_ERR("Bus reset in progress - retry command later"); | ||
2494 | return; | ||
2495 | } | ||
2496 | |||
2497 | /* | ||
2498 | * Switch on scsi status | 2487 | * Switch on scsi status |
2499 | */ | 2488 | */ |
2500 | switch (scsi_status) { | 2489 | switch (scsi_status) { |