git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
drivers
/
char
/
agp
/
sgi-agp.c
diff --git
a/drivers/char/agp/sgi-agp.c
b/drivers/char/agp/sgi-agp.c
index
7957fc9
..
d73be4c
100644
(file)
--- a/
drivers/char/agp/sgi-agp.c
+++ b/
drivers/char/agp/sgi-agp.c
@@
-289,6
+289,8
@@
static int __devinit agp_sgi_init(void)
j = 0;
list_for_each_entry(info, &tioca_list, ca_list) {
struct list_head *tmp;
j = 0;
list_for_each_entry(info, &tioca_list, ca_list) {
struct list_head *tmp;
+ if (list_empty(info->ca_devices))
+ continue;
list_for_each(tmp, info->ca_devices) {
u8 cap_ptr;
pdev = pci_dev_b(tmp);
list_for_each(tmp, info->ca_devices) {
u8 cap_ptr;
pdev = pci_dev_b(tmp);
@@
-327,9
+329,8
@@
static int __devinit agp_sgi_init(void)
static void __devexit agp_sgi_cleanup(void)
{
static void __devexit agp_sgi_cleanup(void)
{
- if(sgi_tioca_agp_bridges)
- kfree(sgi_tioca_agp_bridges);
- sgi_tioca_agp_bridges=NULL;
+ kfree(sgi_tioca_agp_bridges);
+ sgi_tioca_agp_bridges = NULL;
}
module_init(agp_sgi_init);
}
module_init(agp_sgi_init);