Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 180170
b: refs/heads/master
c: b3cb537
h: refs/heads/master
v: v3
  • Loading branch information
Alberto Panizzo authored and Linus Torvalds committed Feb 3, 2010
1 parent 6fd2dd4 commit 9d24c25
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 859ddf09743a8cc680af33f7259ccd0fd36bfe9d
refs/heads/master: b3cb53721890879d7bde31f5f9eefd4edf41ab64
12 changes: 8 additions & 4 deletions trunk/drivers/video/mx3fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 9d24c25

Please sign in to comment.