summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 19:08:13 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 19:08:13 -0700
commit4b8447184ae85de4ce710e5f561fbaada21b8394 (patch)
tree71aed2c654a6d8d83beff480bc84d9e63b366858 /drivers
parenta43cdf08a1b1ab3c013059b5fa4c1b7561e53cb7 (diff)
parent1604f31895dcdb42edf6511ce7ef0546ff92c8e5 (diff)
downloadop-kernel-dev-4b8447184ae85de4ce710e5f561fbaada21b8394.zip
op-kernel-dev-4b8447184ae85de4ce710e5f561fbaada21b8394.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6: [PA-RISC] Fix time.c for new do_timer() calling convention [PA-RISC] Fix must_check warnings in drivers.c [PA-RISC] Fix parisc_newuname() [PA-RISC] Remove warning from pci.c [PA-RISC] Fix filldir warnings [PA-RISC] Fix sys32_sysctl [PA-RISC] Fix sba_iommu compilation
Diffstat (limited to 'drivers')
-rw-r--r--drivers/parisc/sba_iommu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 294c111..f1e7ccd 100644
--- 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",
OpenPOWER on IntegriCloud