git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
sn
/
pci
/
pcibr
/
pcibr_ate.c
diff --git
a/arch/ia64/sn/pci/pcibr/pcibr_ate.c
b/arch/ia64/sn/pci/pcibr/pcibr_ate.c
index 239b3cedcf2bfde7848aca3ecca03631c228d15e..5bc34eac9e0193b416d3d22690a75d6a63b7c719 100644
(file)
--- a/
arch/ia64/sn/pci/pcibr/pcibr_ate.c
+++ b/
arch/ia64/sn/pci/pcibr/pcibr_ate.c
@@
-54,6
+54,8
@@
static int find_free_ate(struct ate_resource *ate_resource, int start,
break;
}
}
+ if (i >= ate_resource->num_ate)
+ return -1;
} else
index++; /* Try next ate */
}