From 2dc28a2a5c1cf25643ed2e4f5bd6d49d9a3f75cf Mon Sep 17 00:00:00 2001 From: Samreen Date: Tue, 16 Nov 2010 12:49:07 +0100 Subject: [PATCH] --- yaml --- r: 230485 b: refs/heads/master c: 36e8c27f3bee5e58f96b0a79d65922fa9e53b030 h: refs/heads/master i: 230483: 815c7f0b550b77932ee5f6ac1fdd68ae04dea4bc v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/omapfb/omapfb-main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b0d54cc805a4..7946b76ba830 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed3f90954654a5d9d07b30d39434392a644602fb +refs/heads/master: 36e8c27f3bee5e58f96b0a79d65922fa9e53b030 diff --git a/trunk/drivers/video/omap2/omapfb/omapfb-main.c b/trunk/drivers/video/omap2/omapfb/omapfb-main.c index 6a704f176c22..4fdab8e9c496 100644 --- a/trunk/drivers/video/omap2/omapfb/omapfb-main.c +++ b/trunk/drivers/video/omap2/omapfb/omapfb-main.c @@ -2132,8 +2132,9 @@ static int omapfb_parse_def_modes(struct omapfb2_device *fbdev) char *str, *options, *this_opt; int r = 0; - str = kmalloc(strlen(def_mode) + 1, GFP_KERNEL); - strcpy(str, def_mode); + str = kstrdup(def_mode, GFP_KERNEL); + if (!str) + return -ENOMEM; options = str; while (!r && (this_opt = strsep(&options, ",")) != NULL) {