diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2010-03-15 13:20:32 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-03-15 14:29:44 +0100 |
| commit | cf36df6bfb49fd265a39f676bfc9718029fef160 (patch) | |
| tree | 684051014d4d516a5510797e4b887a06d412cb65 /drivers/firewire/core-iso.c | |
| parent | 6fdb2ee243404c7cbf530387bf904ad1841ebf5b (diff) | |
| download | linux-cf36df6bfb49fd265a39f676bfc9718029fef160.tar.gz linux-cf36df6bfb49fd265a39f676bfc9718029fef160.tar.bz2 linux-cf36df6bfb49fd265a39f676bfc9718029fef160.zip | |
firewire: core: fw_iso_resource_manage: fix error handling
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>
Diffstat (limited to 'drivers/firewire/core-iso.c')
| -rw-r--r-- | drivers/firewire/core-iso.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/firewire/core-iso.c b/drivers/firewire/core-iso.c index 1c0b504a42f3..99c20f1b613a 100644 --- a/drivers/firewire/core-iso.c +++ b/drivers/firewire/core-iso.c @@ -331,8 +331,9 @@ void fw_iso_resource_manage(struct fw_card *card, int generation, if (ret < 0) *bandwidth = 0; - if (allocate && ret < 0 && c >= 0) { - deallocate_channel(card, irm_id, generation, c, buffer); + if (allocate && ret < 0) { + if (c >= 0) + deallocate_channel(card, irm_id, generation, c, buffer); *channel = ret; } } |