From dd0bc748cf4d0afee2235ee22f10f5dba72ad5b2 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 4 Aug 2011 13:57:33 +1000 Subject: [PATCH] --- yaml --- r: 269671 b: refs/heads/master c: a8e415d3eb1bed184d73e22c62cd1f992bd33d63 h: refs/heads/master i: 269669: d94d86008b96dba08a47cac82b00336a53934538 269667: ecb3c85128d1a793eb126951c92ac46abcbc6f93 269663: 0cca832a2671c5cafcc09ee7ed49fb3ba6a90c25 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_bios.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 093028055560..0540e92fe5a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5024c54b5cc6e93a8e2713f53981423d0deb60d7 +refs/heads/master: a8e415d3eb1bed184d73e22c62cd1f992bd33d63 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c index 58d8c85b85d1..528fb6087814 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c @@ -3771,6 +3771,10 @@ parse_init_table(struct nvbios *bios, uint16_t offset, struct init_exec *iexec) int count = 0, i, ret; uint8_t id; + /* catch NULL script pointers */ + if (offset == 0) + return 0; + /* * Loop until INIT_DONE causes us to break out of the loop * (or until offset > bios length just in case... )