Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / video / omap2 / omapfb / omapfb-main.c

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 6a704f176c222a004f8732268e04cafb82ed1a70..4fdab8e9c4963249ab9d47b19eb33c56a9422fbe 100644 (file)
--- 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) {