lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

firewire: core: fw_iso_resource_manage: fix error handling

Browse Source 
If the bandwidth allocation fails, the error must be returned in
*channel regardless of whether the channel allocation succeeded.
Checking for c >= 0 is not correct if no channel allocation was
requested, in which case this part of the code is reached with
c == -EINVAL.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Clemens Ladisch
2010-03-15 13:20:32 +01:00
committed by Stefan Richter
parent 6fdb2ee243
commit cf36df6bfb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/firewire/core-iso.c
View File

@@ -331,8 +331,9 @@ void fw_iso_resource_manage(struct fw_card *card, int generation,
if (ret < 0) if (ret < 0)
*bandwidth = 0; *bandwidth = 0;
if (allocate && ret < 0 && c >= 0) { if (allocate && ret < 0) {
deallocate_channel(card, irm_id, generation, c, buffer); if (c >= 0)
deallocate_channel(card, irm_id, generation, c, buffer);
*channel = ret; *channel = ret;
} }
} }