diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 17:38:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 17:38:16 -0700 |
| commit | 98b96173c777c67daaa7d163a35e591e1928a164 (patch) | |
| tree | 0530429db1328a00b89972ca67d15e1b61e66ba8 /drivers/char/agp/sgi-agp.c | |
| parent | cf8ba7a95511b86608acb481ad96219fe2da4b3a (diff) | |
| parent | 881ba59d4685b28433bf313b6db51672a02696a3 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
[AGPGART] sworks-agp: Switch to PCI ref counting APIs
[AGPGART] Nvidia AGP: Use refcount aware PCI interfaces
[AGPGART] Fix sparse warning in sgi-agp.c
[AGPGART] Intel-agp adjustments
[AGPGART] Move [un]map_page_into_agp into asm/agp.h
[AGPGART] Add missing calls to global_flush_tlb() to ali-agp
[AGPGART] prevent probe collision of sis-agp and amd64_agp
Diffstat (limited to 'drivers/char/agp/sgi-agp.c')
| -rw-r--r-- | drivers/char/agp/sgi-agp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/agp/sgi-agp.c b/drivers/char/agp/sgi-agp.c index ee8f50edde1..cda608c42be 100644 --- a/drivers/char/agp/sgi-agp.c +++ b/drivers/char/agp/sgi-agp.c @@ -47,9 +47,8 @@ static void *sgi_tioca_alloc_page(struct agp_bridge_data *bridge) nid = info->ca_closest_node; page = alloc_pages_node(nid, GFP_KERNEL, 0); - if (page == NULL) { - return 0; - } + if (!page) + return NULL; get_page(page); SetPageLocked(page); |