diff options
Diffstat (limited to 'drivers/firewire/core-cdev.c')
-rw-r--r-- | drivers/firewire/core-cdev.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index 48ae712e2101..4434f7ca11d5 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c | |||
@@ -544,14 +544,8 @@ static void complete_transaction(struct fw_card *card, int rcode, | |||
544 | * 1. If called while in shutdown, the idr tree must be left untouched. | 544 | * 1. If called while in shutdown, the idr tree must be left untouched. |
545 | * The idr handle will be removed and the client reference will be | 545 | * The idr handle will be removed and the client reference will be |
546 | * dropped later. | 546 | * dropped later. |
547 | * 2. If the call chain was release_client_resource -> | ||
548 | * release_transaction -> complete_transaction (instead of a normal | ||
549 | * conclusion of the transaction), i.e. if this resource was already | ||
550 | * unregistered from the idr, the client reference will be dropped | ||
551 | * by release_client_resource and we must not drop it here. | ||
552 | */ | 547 | */ |
553 | if (!client->in_shutdown && | 548 | if (!client->in_shutdown) { |
554 | idr_find(&client->resource_idr, e->r.resource.handle)) { | ||
555 | idr_remove(&client->resource_idr, e->r.resource.handle); | 549 | idr_remove(&client->resource_idr, e->r.resource.handle); |
556 | /* Drop the idr's reference */ | 550 | /* Drop the idr's reference */ |
557 | client_put(client); | 551 | client_put(client); |