Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 208715
b: refs/heads/master
c: dba6f38
h: refs/heads/master
i:
  208713: 8d13b99
  208711: bba4640
v: v3
  • Loading branch information
Guennadi Liakhovetski authored and Paul Mundt committed Aug 4, 2010
1 parent 956711f commit 7f2e158
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: 8a2b6beffc88b83089845d72eed2ed74eb5c9b1e
refs/heads/master: dba6f385b83d7f19eb1d4df12f422bab945c7f10
6 changes: 4 additions & 2 deletions trunk/drivers/video/sh_mobile_lcdcfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1020,14 +1020,16 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev)
goto err1;
}

priv->base = ioremap_nocache(res->start, resource_size(res));
if (!priv->base)
goto err1;

error = sh_mobile_lcdc_setup_clocks(pdev, pdata->clock_source, priv);
if (error) {
dev_err(&pdev->dev, "unable to setup clocks\n");
goto err1;
}

priv->base = ioremap_nocache(res->start, (res->end - res->start) + 1);

for (i = 0; i < j; i++) {
cfg = &priv->ch[i].cfg;

Expand Down

0 comments on commit 7f2e158

Please sign in to comment.