Merge branch 'origin'

[linux-2.6-omap-h63xx.git] / drivers / char / agp / isoch.c

diff --git a/drivers/char/agp/isoch.c b/drivers/char/agp/isoch.c
index 40083241804eee1b48f09902e7c67a82d0cf7276..7c14a096b85eea4a3fc793ef329324989a27a77f 100644 (file)
--- 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,
                        master[cdev].rq *= (1 << (master[cdev].y - 1));
 
                tot_rq += master[cdev].rq;
-
-               if (cdev == ndevs-1)
-                       master[cdev].n += rem;
        }
+       master[ndevs-1].n += rem;
 
        /* Figure the number of isochronous and asynchronous RQ slots the
         * target is providing. */