diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/mx3fb.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index 054ef29be479..772ba3f45e6f 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) | |||
| 324 | unsigned long flags; | 324 | unsigned long flags; |
| 325 | dma_cookie_t cookie; | 325 | dma_cookie_t cookie; |
| 326 | 326 | ||
| 327 | dev_dbg(mx3fb->dev, "mx3fbi %p, desc %p, sg %p\n", mx3_fbi, | 327 | if (mx3_fbi->txd) |
| 328 | to_tx_desc(mx3_fbi->txd), to_tx_desc(mx3_fbi->txd)->sg); | 328 | dev_dbg(mx3fb->dev, "mx3fbi %p, desc %p, sg %p\n", mx3_fbi, |
| 329 | to_tx_desc(mx3_fbi->txd), to_tx_desc(mx3_fbi->txd)->sg); | ||
| 330 | else | ||
| 331 | dev_dbg(mx3fb->dev, "mx3fbi %p, txd = NULL\n", mx3_fbi); | ||
| 329 | 332 | ||
| 330 | /* This enables the channel */ | 333 | /* This enables the channel */ |
| 331 | if (mx3_fbi->cookie < 0) { | 334 | if (mx3_fbi->cookie < 0) { |
| @@ -646,6 +649,7 @@ static int sdc_set_global_alpha(struct mx3fb_data *mx3fb, bool enable, uint8_t a | |||
| 646 | 649 | ||
| 647 | static void sdc_set_brightness(struct mx3fb_data *mx3fb, uint8_t value) | 650 | static void sdc_set_brightness(struct mx3fb_data *mx3fb, uint8_t value) |
| 648 | { | 651 | { |
| 652 | dev_dbg(mx3fb->dev, "%s: value = %d\n", __func__, value); | ||
| 649 | /* This might be board-specific */ | 653 | /* This might be board-specific */ |
| 650 | mx3fb_write_reg(mx3fb, 0x03000000UL | value << 16, SDC_PWM_CTRL); | 654 | mx3fb_write_reg(mx3fb, 0x03000000UL | value << 16, SDC_PWM_CTRL); |
| 651 | return; | 655 | return; |
| @@ -1486,12 +1490,12 @@ static int mx3fb_probe(struct platform_device *pdev) | |||
| 1486 | goto ersdc0; | 1490 | goto ersdc0; |
| 1487 | } | 1491 | } |
| 1488 | 1492 | ||
| 1493 | mx3fb->backlight_level = 255; | ||
| 1494 | |||
| 1489 | ret = init_fb_chan(mx3fb, to_idmac_chan(chan)); | 1495 | ret = init_fb_chan(mx3fb, to_idmac_chan(chan)); |
| 1490 | if (ret < 0) | 1496 | if (ret < 0) |
| 1491 | goto eisdc0; | 1497 | goto eisdc0; |
| 1492 | 1498 | ||
| 1493 | mx3fb->backlight_level = 255; | ||
| 1494 | |||
| 1495 | return 0; | 1499 | return 0; |
| 1496 | 1500 | ||
| 1497 | eisdc0: | 1501 | eisdc0: |
