Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / drivers / parisc / sba_iommu.c

diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 294c1117098d69d6a0a9c13e26cd9f4727fbf528..f1e7ccd5475bb413888272112e1937d67e4d5f36 100644 (file)
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -1320,12 +1320,12 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
        ** the GART code to handshake on.
        */
        klist_iter_init(&sba->dev.klist_children, &i);
-       while (dev = next_device(&i)) {
+       while ((dev = next_device(&i))) {
                struct parisc_device *lba = to_parisc_device(dev);
                if (IS_QUICKSILVER(lba))
                        agp_found = 1;
        }
-       klist_iter_exit(&sba->dev.klist_children, &i);
+       klist_iter_exit(&i);
 
        if (agp_found && sba_reserve_agpgart) {
                printk(KERN_INFO "%s: reserving %dMb of IOVA space for agpgart\n",