diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-08-14 18:46:00 +0200 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-17 19:34:33 +0200 |
| commit | 4fc383c09d14783ca7d7e97e2134abbe7dc43230 (patch) | |
| tree | c1163633adfea681f340d3a42814aaded3ef6515 | |
| parent | 1f427e8055b1ab408395d6da421d93783120484c (diff) | |
| download | kernel_samsung_tuna-4fc383c09d14783ca7d7e97e2134abbe7dc43230.zip kernel_samsung_tuna-4fc383c09d14783ca7d7e97e2134abbe7dc43230.tar.gz kernel_samsung_tuna-4fc383c09d14783ca7d7e97e2134abbe7dc43230.tar.bz2 | |
ieee1394: sbp2: recheck node generation in sbp2_update
While sbp2_update() is doing its duties after a bus reset, another reset
could happen. Don't accept new requests until the next undisturbed
sbp2_update() or until sbp2_remove().
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| -rw-r--r-- | drivers/ieee1394/sbp2.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index b5bcca3..5440cd0 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; } |