diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-09 18:02:02 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-09 18:02:02 -0400 |
| commit | bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd (patch) | |
| tree | d67f525c76b66956ba7ca0d40bc0fcda0e414700 /drivers/firewire/core-iso.c | |
| parent | 9d7302299ee96ca954fe4ab8ca640333b6e19ad0 (diff) | |
| parent | 7135a71b19be1faf48b7148d77844d03bc0717d6 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/firewire/core-iso.c')
| -rw-r--r-- | drivers/firewire/core-iso.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firewire/core-iso.c b/drivers/firewire/core-iso.c index 110e731f5574..1c0b504a42f3 100644 --- a/drivers/firewire/core-iso.c +++ b/drivers/firewire/core-iso.c | |||
| @@ -196,7 +196,7 @@ static int manage_bandwidth(struct fw_card *card, int irm_id, int generation, | |||
| 196 | switch (fw_run_transaction(card, TCODE_LOCK_COMPARE_SWAP, | 196 | switch (fw_run_transaction(card, TCODE_LOCK_COMPARE_SWAP, |
| 197 | irm_id, generation, SCODE_100, | 197 | irm_id, generation, SCODE_100, |
| 198 | CSR_REGISTER_BASE + CSR_BANDWIDTH_AVAILABLE, | 198 | CSR_REGISTER_BASE + CSR_BANDWIDTH_AVAILABLE, |
| 199 | data, sizeof(data))) { | 199 | data, 8)) { |
| 200 | case RCODE_GENERATION: | 200 | case RCODE_GENERATION: |
| 201 | /* A generation change frees all bandwidth. */ | 201 | /* A generation change frees all bandwidth. */ |
| 202 | return allocate ? -EAGAIN : bandwidth; | 202 | return allocate ? -EAGAIN : bandwidth; |
| @@ -233,7 +233,7 @@ static int manage_channel(struct fw_card *card, int irm_id, int generation, | |||
| 233 | data[1] = old ^ c; | 233 | data[1] = old ^ c; |
| 234 | switch (fw_run_transaction(card, TCODE_LOCK_COMPARE_SWAP, | 234 | switch (fw_run_transaction(card, TCODE_LOCK_COMPARE_SWAP, |
| 235 | irm_id, generation, SCODE_100, | 235 | irm_id, generation, SCODE_100, |
| 236 | offset, data, sizeof(data))) { | 236 | offset, data, 8)) { |
| 237 | case RCODE_GENERATION: | 237 | case RCODE_GENERATION: |
| 238 | /* A generation change frees all channels. */ | 238 | /* A generation change frees all channels. */ |
| 239 | return allocate ? -EAGAIN : i; | 239 | return allocate ? -EAGAIN : i; |