Merge branch 'linux-2.6'

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/char/agp/sgi-agp.c b/drivers/char/agp/sgi-agp.c
index ee8f50edde1b..cda608c42bea 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);