diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 19:20:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 19:20:55 -0500 |
commit | 10379a25fee8ddc8698d2f6c54ccedd4664c2941 (patch) | |
tree | fba7fe3a1aa8e85104f9dcf08ff217dd4b0160c4 /drivers/char/agp/isoch.c | |
parent | 63b3ced0f80ae1c437620d3f7d6ff2bcf0745b0a (diff) | |
parent | 3b0e8eadc511eaceba6d6b8d0743359a34ee23c6 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
Diffstat (limited to 'drivers/char/agp/isoch.c')
-rw-r--r-- | drivers/char/agp/isoch.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/agp/isoch.c b/drivers/char/agp/isoch.c index 40083241804e..7c14a096b85e 100644 --- a/drivers/char/agp/isoch.c +++ b/drivers/char/agp/isoch.c | |||
@@ -218,10 +218,8 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge, | |||
218 | master[cdev].rq *= (1 << (master[cdev].y - 1)); | 218 | master[cdev].rq *= (1 << (master[cdev].y - 1)); |
219 | 219 | ||
220 | tot_rq += master[cdev].rq; | 220 | tot_rq += master[cdev].rq; |
221 | |||
222 | if (cdev == ndevs-1) | ||
223 | master[cdev].n += rem; | ||
224 | } | 221 | } |
222 | master[ndevs-1].n += rem; | ||
225 | 223 | ||
226 | /* Figure the number of isochronous and asynchronous RQ slots the | 224 | /* Figure the number of isochronous and asynchronous RQ slots the |
227 | * target is providing. */ | 225 | * target is providing. */ |