diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2011-03-15 00:04:42 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2011-03-20 16:45:24 +0100 |
| commit | 7a4e1e9c682cd87fe8a749b435b13afeef083c34 (patch) | |
| tree | 4a2d0558222d25a2d37fc215cc95090ace00ffa7 /drivers/firewire | |
| parent | dd5eeb99f47d18c05efffcd247c0aa07eaa9ffaa (diff) | |
| download | kernel_samsung_crespo-7a4e1e9c682cd87fe8a749b435b13afeef083c34.zip kernel_samsung_crespo-7a4e1e9c682cd87fe8a749b435b13afeef083c34.tar.gz kernel_samsung_crespo-7a4e1e9c682cd87fe8a749b435b13afeef083c34.tar.bz2 | |
firewire: sbp2: revert obsolete 'fix stall with "Unsolicited response"'
Now that firewire-core sets the local node's SPLIT_TIMEOUT to 2 seconds
per default, commit a481e97d3cdc40b9d58271675bd4f0abb79d4872 is no
longer required.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire')
| -rw-r--r-- | drivers/firewire/sbp2.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c index afa576a..77ed589 100644 --- a/drivers/firewire/sbp2.c +++ b/drivers/firewire/sbp2.c @@ -472,18 +472,12 @@ static void complete_transaction(struct fw_card *card, int rcode, * So this callback only sets the rcode if it hasn't already * been set and only does the cleanup if the transaction * failed and we didn't already get a status write. - * - * Here we treat RCODE_CANCELLED like RCODE_COMPLETE because some - * OXUF936QSE firmwares occasionally respond after Split_Timeout and - * complete the ORB just fine. Note, we also get RCODE_CANCELLED - * from sbp2_cancel_orbs() if fw_cancel_transaction() == 0. */ spin_lock_irqsave(&card->lock, flags); if (orb->rcode == -1) orb->rcode = rcode; - - if (orb->rcode != RCODE_COMPLETE && orb->rcode != RCODE_CANCELLED) { + if (orb->rcode != RCODE_COMPLETE) { list_del(&orb->link); spin_unlock_irqrestore(&card->lock, flags); @@ -532,7 +526,8 @@ static int sbp2_cancel_orbs(struct sbp2_logical_unit *lu) list_for_each_entry_safe(orb, next, &list, link) { retval = 0; - fw_cancel_transaction(device->card, &orb->t); + if (fw_cancel_transaction(device->card, &orb->t) == 0) + continue; orb->rcode = RCODE_CANCELLED; orb->callback(orb, NULL); |