diff --git a/[refs] b/[refs]
index 74b67938f478..7222c39034a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea1ce3762b0ed9647d002dad8f3745c2ae534d0a
+refs/heads/master: f92e88343e713c65f6edef4ed7883ba37a8ccbfd
diff --git a/trunk/drivers/staging/gma500/psb_gem.c b/trunk/drivers/staging/gma500/psb_gem.c
index d47c187f1650..518f8c163464 100644
--- a/trunk/drivers/staging/gma500/psb_gem.c
+++ b/trunk/drivers/staging/gma500/psb_gem.c
@@ -100,8 +100,8 @@ static int psb_gem_create(struct drm_file *file,
 	/* Allocate our object - for now a direct gtt range which is not 
 	   stolen memory backed */
 	r = psb_gtt_alloc_range(dev, size, "gem", 0);
-	if (IS_ERR(r))
-		return PTR_ERR(r);
+	if (r == NULL)
+		return -ENOSPC;
 	/* Initialize the extra goodies GEM needs to do all the hard work */
 	if (drm_gem_object_init(dev, &r->gem, size) != 0) {
 		psb_gtt_free_range(dev, r);
@@ -135,7 +135,7 @@ static int psb_gem_create(struct drm_file *file,
 int psb_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
 			struct drm_mode_create_dumb *args)
 {
-	args->pitch = ALIGN(args->width & ((args->bpp + 1) / 8), 64);
+	args->pitch = ALIGN(args->width * ((args->bpp + 7) / 8), 64);
 	args->size = args->pitch * args->height;
 	return psb_gem_create(file, dev, args->size, &args->handle);
 }
diff --git a/trunk/drivers/staging/gma500/psb_gtt.c b/trunk/drivers/staging/gma500/psb_gtt.c
index 10d772aa802c..dc0a4b7850d2 100644
--- a/trunk/drivers/staging/gma500/psb_gtt.c
+++ b/trunk/drivers/staging/gma500/psb_gtt.c
@@ -277,7 +277,7 @@ struct gtt_range *psb_gtt_alloc_range(struct drm_device *dev, int len,
         } else {
                 /* The rest we will use for GEM backed objects */
                 start = r->start + dev_priv->pg->stolen_size;
-                end = -1;
+                end = r->end;
         }
 
 	gt = kzalloc(sizeof(struct gtt_range), GFP_KERNEL);