diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-02-05 12:16:39 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-05 12:16:39 +0900 |
| commit | 8e04221029067cbaff3fc8f4daf991532afbcbaf (patch) | |
| tree | 18cf757bcd315c76f5f458aa72a0a57db0a78985 /drivers/video | |
| parent | 9ad62ec4f752c82b39aa5927f23d894b46ae10b9 (diff) | |
| parent | 2c940db250c1610d95ea5331dc819b8bd4db96ae (diff) | |
| download | kernel_samsung_aries-8e04221029067cbaff3fc8f4daf991532afbcbaf.zip kernel_samsung_aries-8e04221029067cbaff3fc8f4daf991532afbcbaf.tar.gz kernel_samsung_aries-8e04221029067cbaff3fc8f4daf991532afbcbaf.tar.bz2 | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/imxfb.c | 6 | ||||
| -rw-r--r-- | drivers/video/mx3fb.c | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c index 66358fa..b4b6dece 100644 --- a/drivers/video/imxfb.c +++ b/drivers/video/imxfb.c @@ -593,7 +593,8 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf */ static int imxfb_suspend(struct platform_device *dev, pm_message_t state) { - struct imxfb_info *fbi = platform_get_drvdata(dev); + struct fb_info *info = platform_get_drvdata(dev); + struct imxfb_info *fbi = info->par; pr_debug("%s\n", __func__); @@ -603,7 +604,8 @@ static int imxfb_suspend(struct platform_device *dev, pm_message_t state) static int imxfb_resume(struct platform_device *dev) { - struct imxfb_info *fbi = platform_get_drvdata(dev); + struct fb_info *info = platform_get_drvdata(dev); + struct imxfb_info *fbi = info->par; pr_debug("%s\n", __func__); diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index 054ef29..772ba3f 100644 --- a/drivers/video/mx3fb.c +++ b/drivers/video/mx3fb.c @@ -324,8 +324,11 @@ static void sdc_enable_channel(struct mx3fb_info *mx3_fbi) unsigned long flags; dma_cookie_t cookie; - dev_dbg(mx3fb->dev, "mx3fbi %p, desc %p, sg %p\n", mx3_fbi, - to_tx_desc(mx3_fbi->txd), to_tx_desc(mx3_fbi->txd)->sg); + if (mx3_fbi->txd) + dev_dbg(mx3fb->dev, "mx3fbi %p, desc %p, sg %p\n", mx3_fbi, + to_tx_desc(mx3_fbi->txd), to_tx_desc(mx3_fbi->txd)->sg); + else + dev_dbg(mx3fb->dev, "mx3fbi %p, txd = NULL\n", mx3_fbi); /* This enables the channel */ if (mx3_fbi->cookie < 0) { @@ -646,6 +649,7 @@ static int sdc_set_global_alpha(struct mx3fb_data *mx3fb, bool enable, uint8_t a static void sdc_set_brightness(struct mx3fb_data *mx3fb, uint8_t value) { + dev_dbg(mx3fb->dev, "%s: value = %d\n", __func__, value); /* This might be board-specific */ mx3fb_write_reg(mx3fb, 0x03000000UL | value << 16, SDC_PWM_CTRL); return; @@ -1486,12 +1490,12 @@ static int mx3fb_probe(struct platform_device *pdev) goto ersdc0; } + mx3fb->backlight_level = 255; + ret = init_fb_chan(mx3fb, to_idmac_chan(chan)); if (ret < 0) goto eisdc0; - mx3fb->backlight_level = 255; - return 0; eisdc0: |