From 8771052b772ad338587c8bcb2d258b72b442564d Mon Sep 17 00:00:00 2001 From: Wang YanQing Date: Mon, 13 Aug 2012 18:02:32 +0800 Subject: [PATCH] --- yaml --- r: 333431 b: refs/heads/master c: 7ed25867478fb8d2118eb84b99c1bf21e4ae695c h: refs/heads/master i: 333429: 0f3c5b5009224cfc1b3c0a3f2ece39f1e1f1c2d0 333427: fffca9e18bb2ba301a68e4981d0ca730a4d9f963 333423: 4f586f46e2baa48126f6ee8e2a405c062ace7919 v: v3 --- [refs] | 2 +- trunk/drivers/video/uvesafb.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9b3adcd0b08e..dd4ae7f0292a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bada55371fb2b3615983ba231cad61ef21bdf9c3 +refs/heads/master: 7ed25867478fb8d2118eb84b99c1bf21e4ae695c diff --git a/trunk/drivers/video/uvesafb.c b/trunk/drivers/video/uvesafb.c index b0e2a4261afe..2f8f82d874a1 100644 --- a/trunk/drivers/video/uvesafb.c +++ b/trunk/drivers/video/uvesafb.c @@ -659,6 +659,8 @@ static int __devinit uvesafb_vbe_getedid(struct uvesafb_ktask *task, task->t.flags = TF_BUF_RET | TF_BUF_ESDI; task->t.buf_len = EDID_LENGTH; task->buf = kzalloc(EDID_LENGTH, GFP_KERNEL); + if (!task->buf) + return -ENOMEM; err = uvesafb_exec(task);