Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/char/agp/sgi-agp.c b/drivers/char/agp/sgi-agp.c
index 7957fc91f6ad..4df7734b51c2 100644
--- 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;
+                if (list_empty(info->ca_devices))
+                        continue;
                 list_for_each(tmp, info->ca_devices) {
                         u8 cap_ptr;
                         pdev = pci_dev_b(tmp);