diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/backlight/88pm860x_bl.c | 1 | ||||
-rw-r--r-- | drivers/video/efifb.c | 4 | ||||
-rw-r--r-- | drivers/video/exynos/exynos_mipi_dsi.c | 2 | ||||
-rw-r--r-- | drivers/video/tmiofb.c | 4 |
4 files changed, 8 insertions, 3 deletions
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c index f75da8758ad..f49181c7311 100644 --- a/drivers/video/backlight/88pm860x_bl.c +++ b/drivers/video/backlight/88pm860x_bl.c | |||
@@ -228,7 +228,6 @@ static int pm860x_backlight_probe(struct platform_device *pdev) | |||
228 | data->port = pdata->flags; | 228 | data->port = pdata->flags; |
229 | if (data->port < 0) { | 229 | if (data->port < 0) { |
230 | dev_err(&pdev->dev, "wrong platform data is assigned"); | 230 | dev_err(&pdev->dev, "wrong platform data is assigned"); |
231 | kfree(data); | ||
232 | return -EINVAL; | 231 | return -EINVAL; |
233 | } | 232 | } |
234 | 233 | ||
diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c index b4a632ada40..932abaa58a8 100644 --- a/drivers/video/efifb.c +++ b/drivers/video/efifb.c | |||
@@ -553,7 +553,9 @@ static int __init efifb_init(void) | |||
553 | int ret; | 553 | int ret; |
554 | char *option = NULL; | 554 | char *option = NULL; |
555 | 555 | ||
556 | dmi_check_system(dmi_system_table); | 556 | if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI || |
557 | !(screen_info.capabilities & VIDEO_CAPABILITY_SKIP_QUIRKS)) | ||
558 | dmi_check_system(dmi_system_table); | ||
557 | 559 | ||
558 | if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI) | 560 | if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI) |
559 | return -ENODEV; | 561 | return -ENODEV; |
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c index 4bc2b8a5dd8..663c308d0e7 100644 --- a/drivers/video/exynos/exynos_mipi_dsi.c +++ b/drivers/video/exynos/exynos_mipi_dsi.c | |||
@@ -461,7 +461,7 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev) | |||
461 | done: | 461 | done: |
462 | platform_set_drvdata(pdev, dsim); | 462 | platform_set_drvdata(pdev, dsim); |
463 | 463 | ||
464 | dev_dbg(&pdev->dev, "%s() completed sucessfuly (%s mode)\n", __func__, | 464 | dev_dbg(&pdev->dev, "%s() completed successfully (%s mode)\n", __func__, |
465 | dsim_config->e_interface == DSIM_COMMAND ? "CPU" : "RGB"); | 465 | dsim_config->e_interface == DSIM_COMMAND ? "CPU" : "RGB"); |
466 | 466 | ||
467 | return 0; | 467 | return 0; |
diff --git a/drivers/video/tmiofb.c b/drivers/video/tmiofb.c index 8e4a446b5ed..b244f060f15 100644 --- a/drivers/video/tmiofb.c +++ b/drivers/video/tmiofb.c | |||
@@ -694,6 +694,10 @@ static int __devinit tmiofb_probe(struct platform_device *dev) | |||
694 | dev_err(&dev->dev, "NULL platform data!\n"); | 694 | dev_err(&dev->dev, "NULL platform data!\n"); |
695 | return -EINVAL; | 695 | return -EINVAL; |
696 | } | 696 | } |
697 | if (ccr == NULL || lcr == NULL || vram == NULL || irq < 0) { | ||
698 | dev_err(&dev->dev, "missing resources\n"); | ||
699 | return -EINVAL; | ||
700 | } | ||
697 | 701 | ||
698 | info = framebuffer_alloc(sizeof(struct tmiofb_par), &dev->dev); | 702 | info = framebuffer_alloc(sizeof(struct tmiofb_par), &dev->dev); |
699 | 703 | ||