diff options
Diffstat (limited to 'arch/arm/mach-omap2/display.c')
| -rw-r--r-- | arch/arm/mach-omap2/display.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index 7012068ccbf6..1011995f150a 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c | |||
| @@ -95,7 +95,6 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initconst = { | |||
| 95 | { "dss_core", "omapdss_dss", -1 }, | 95 | { "dss_core", "omapdss_dss", -1 }, |
| 96 | { "dss_dispc", "omapdss_dispc", -1 }, | 96 | { "dss_dispc", "omapdss_dispc", -1 }, |
| 97 | { "dss_rfbi", "omapdss_rfbi", -1 }, | 97 | { "dss_rfbi", "omapdss_rfbi", -1 }, |
| 98 | { "dss_venc", "omapdss_venc", -1 }, | ||
| 99 | { "dss_dsi1", "omapdss_dsi", 0 }, | 98 | { "dss_dsi1", "omapdss_dsi", 0 }, |
| 100 | { "dss_dsi2", "omapdss_dsi", 1 }, | 99 | { "dss_dsi2", "omapdss_dsi", 1 }, |
| 101 | { "dss_hdmi", "omapdss_hdmi", -1 }, | 100 | { "dss_hdmi", "omapdss_hdmi", -1 }, |
| @@ -221,7 +220,7 @@ static struct platform_device *create_dss_pdev(const char *pdev_name, | |||
| 221 | 220 | ||
| 222 | ohs[0] = oh; | 221 | ohs[0] = oh; |
| 223 | od = omap_device_alloc(pdev, ohs, 1, NULL, 0); | 222 | od = omap_device_alloc(pdev, ohs, 1, NULL, 0); |
| 224 | if (!od) { | 223 | if (IS_ERR(od)) { |
| 225 | pr_err("Could not alloc omap_device for %s\n", pdev_name); | 224 | pr_err("Could not alloc omap_device for %s\n", pdev_name); |
| 226 | r = -ENOMEM; | 225 | r = -ENOMEM; |
| 227 | goto err; | 226 | goto err; |
