diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-11 12:01:14 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-11 12:01:14 +0900 |
| commit | e9ab3207310e8acfa3a5cd8cbb44860f69270bfd (patch) | |
| tree | dce036fd737b4edb7e107e21e4af12fabec29bbd /drivers/video/omap2/omapfb/omapfb-main.c | |
| parent | e54be894eae10eca9892e965cc9532f5d5a11767 (diff) | |
| parent | 18faa1b68a54ff976dd03bfd9ace2c4ef4f7315c (diff) | |
Merge branch 'for-paul-38-rebased' of git://gitorious.org/linux-omap-dss2/linux
Diffstat (limited to 'drivers/video/omap2/omapfb/omapfb-main.c')
| -rw-r--r-- | drivers/video/omap2/omapfb/omapfb-main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index 6a704f176c2..4fdab8e9c49 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/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) { |