diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/gxt4500.c | 2 | ||||
-rw-r--r-- | drivers/video/omap/blizzard.c | 2 | ||||
-rw-r--r-- | drivers/video/omap/dispc.c | 6 | ||||
-rw-r--r-- | drivers/video/omap/hwa742.c | 2 | ||||
-rw-r--r-- | drivers/video/omap/rfbi.c | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c index 23a6bcc3e3ce..e92337bef50d 100644 --- a/drivers/video/gxt4500.c +++ b/drivers/video/gxt4500.c | |||
@@ -636,7 +636,7 @@ static int __devinit gxt4500_probe(struct pci_dev *pdev, | |||
636 | 636 | ||
637 | info = framebuffer_alloc(sizeof(struct gxt4500_par), &pdev->dev); | 637 | info = framebuffer_alloc(sizeof(struct gxt4500_par), &pdev->dev); |
638 | if (!info) { | 638 | if (!info) { |
639 | dev_err(&pdev->dev, "gxt4500: cannot alloc FB info record"); | 639 | dev_err(&pdev->dev, "gxt4500: cannot alloc FB info record\n"); |
640 | goto err_free_fb; | 640 | goto err_free_fb; |
641 | } | 641 | } |
642 | par = info->par; | 642 | par = info->par; |
diff --git a/drivers/video/omap/blizzard.c b/drivers/video/omap/blizzard.c index e682940a97a4..4d8ad9cd0e19 100644 --- a/drivers/video/omap/blizzard.c +++ b/drivers/video/omap/blizzard.c | |||
@@ -225,7 +225,7 @@ static void blizzard_restart_sdram(void) | |||
225 | while (!(blizzard_read_reg(BLIZZARD_MEM_BANK0_STATUS) & 0x01)) { | 225 | while (!(blizzard_read_reg(BLIZZARD_MEM_BANK0_STATUS) & 0x01)) { |
226 | if (time_after(jiffies, tmo)) { | 226 | if (time_after(jiffies, tmo)) { |
227 | dev_err(blizzard.fbdev->dev, | 227 | dev_err(blizzard.fbdev->dev, |
228 | "s1d1374x: SDRAM not ready"); | 228 | "s1d1374x: SDRAM not ready\n"); |
229 | break; | 229 | break; |
230 | } | 230 | } |
231 | msleep(1); | 231 | msleep(1); |
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c index f4c23434de6f..ab32ceb06178 100644 --- a/drivers/video/omap/dispc.c +++ b/drivers/video/omap/dispc.c | |||
@@ -880,19 +880,19 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev) | |||
880 | static int get_dss_clocks(void) | 880 | static int get_dss_clocks(void) |
881 | { | 881 | { |
882 | if (IS_ERR((dispc.dss_ick = clk_get(dispc.fbdev->dev, "dss_ick")))) { | 882 | if (IS_ERR((dispc.dss_ick = clk_get(dispc.fbdev->dev, "dss_ick")))) { |
883 | dev_err(dispc.fbdev->dev, "can't get dss_ick"); | 883 | dev_err(dispc.fbdev->dev, "can't get dss_ick\n"); |
884 | return PTR_ERR(dispc.dss_ick); | 884 | return PTR_ERR(dispc.dss_ick); |
885 | } | 885 | } |
886 | 886 | ||
887 | if (IS_ERR((dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck")))) { | 887 | if (IS_ERR((dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck")))) { |
888 | dev_err(dispc.fbdev->dev, "can't get dss1_fck"); | 888 | dev_err(dispc.fbdev->dev, "can't get dss1_fck\n"); |
889 | clk_put(dispc.dss_ick); | 889 | clk_put(dispc.dss_ick); |
890 | return PTR_ERR(dispc.dss1_fck); | 890 | return PTR_ERR(dispc.dss1_fck); |
891 | } | 891 | } |
892 | 892 | ||
893 | if (IS_ERR((dispc.dss_54m_fck = | 893 | if (IS_ERR((dispc.dss_54m_fck = |
894 | clk_get(dispc.fbdev->dev, "dss_54m_fck")))) { | 894 | clk_get(dispc.fbdev->dev, "dss_54m_fck")))) { |
895 | dev_err(dispc.fbdev->dev, "can't get dss_54m_fck"); | 895 | dev_err(dispc.fbdev->dev, "can't get dss_54m_fck\n"); |
896 | clk_put(dispc.dss_ick); | 896 | clk_put(dispc.dss_ick); |
897 | clk_put(dispc.dss1_fck); | 897 | clk_put(dispc.dss1_fck); |
898 | return PTR_ERR(dispc.dss_54m_fck); | 898 | return PTR_ERR(dispc.dss_54m_fck); |
diff --git a/drivers/video/omap/hwa742.c b/drivers/video/omap/hwa742.c index dc48e02f215c..1e642b7a20fe 100644 --- a/drivers/video/omap/hwa742.c +++ b/drivers/video/omap/hwa742.c | |||
@@ -508,7 +508,7 @@ int hwa742_update_window_async(struct fb_info *fbi, | |||
508 | if (unlikely(win->format & | 508 | if (unlikely(win->format & |
509 | ~(0x03 | OMAPFB_FORMAT_FLAG_DOUBLE | | 509 | ~(0x03 | OMAPFB_FORMAT_FLAG_DOUBLE | |
510 | OMAPFB_FORMAT_FLAG_TEARSYNC | OMAPFB_FORMAT_FLAG_FORCE_VSYNC))) { | 510 | OMAPFB_FORMAT_FLAG_TEARSYNC | OMAPFB_FORMAT_FLAG_FORCE_VSYNC))) { |
511 | dev_dbg(hwa742.fbdev->dev, "invalid window flag"); | 511 | dev_dbg(hwa742.fbdev->dev, "invalid window flag\n"); |
512 | r = -EINVAL; | 512 | r = -EINVAL; |
513 | goto out; | 513 | goto out; |
514 | } | 514 | } |
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c index 2b4269813b22..789cfd23c36b 100644 --- a/drivers/video/omap/rfbi.c +++ b/drivers/video/omap/rfbi.c | |||
@@ -84,12 +84,12 @@ static inline u32 rfbi_read_reg(int idx) | |||
84 | static int rfbi_get_clocks(void) | 84 | static int rfbi_get_clocks(void) |
85 | { | 85 | { |
86 | if (IS_ERR((rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "dss_ick")))) { | 86 | if (IS_ERR((rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "dss_ick")))) { |
87 | dev_err(rfbi.fbdev->dev, "can't get dss_ick"); | 87 | dev_err(rfbi.fbdev->dev, "can't get dss_ick\n"); |
88 | return PTR_ERR(rfbi.dss_ick); | 88 | return PTR_ERR(rfbi.dss_ick); |
89 | } | 89 | } |
90 | 90 | ||
91 | if (IS_ERR((rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck")))) { | 91 | if (IS_ERR((rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck")))) { |
92 | dev_err(rfbi.fbdev->dev, "can't get dss1_fck"); | 92 | dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n"); |
93 | clk_put(rfbi.dss_ick); | 93 | clk_put(rfbi.dss_ick); |
94 | return PTR_ERR(rfbi.dss1_fck); | 94 | return PTR_ERR(rfbi.dss1_fck); |
95 | } | 95 | } |