---

yaml --- r: 298534 b: refs/heads/master c: f3718a8 h: refs/heads/master v: v3
git-mirror · Apr 4, 2012 · ff9a020 · ff9a020
1 parent c98999c
commit ff9a020
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01627d968c8b5e2810fe8c417b406b968297c236
+refs/heads/master: f3718a818f7fb3636130d5f34bde8df34f45c5e5
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -273,7 +273,6 @@ bios_shadow(struct drm_device *dev)
 		mthd->score = score_vbios(bios, mthd->rw);
 		mthd->size = bios->length;
 		mthd->data = bios->data;
-		bios->data = NULL;
 	} while (mthd->score != 3 && (++mthd)->shadow);
 
 	mthd = shadow_methods;
@@ -282,8 +281,7 @@ bios_shadow(struct drm_device *dev)
 		if (mthd->score > best->score) {
 			kfree(best->data);
 			best = mthd;
-		} else
-			kfree(mthd->data);
+		}
 	} while ((++mthd)->shadow);
 
 	if (best->score) {