Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 54910
b: refs/heads/master
c: 19f3d3a
h: refs/heads/master
v: v3
  • Loading branch information
Roland Stigge authored and Linus Torvalds committed May 8, 2007
1 parent 291492f commit 84f550a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 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: c930faaed551aac898c618a7df1d68901ff244f0
refs/heads/master: 19f3d3a5546be431f3846d8a8581e7a2f169dba3
3 changes: 2 additions & 1 deletion trunk/drivers/video/epson1355fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -650,9 +650,10 @@ int __init epson1355fb_probe(struct platform_device *dev)
}

info = framebuffer_alloc(sizeof(struct epson1355_par) + sizeof(u32) * 256, &dev->dev);
if (!info)
if (!info) {
rc = -ENOMEM;
goto bail;
}

default_par = info->par;
default_par->reg_addr = (unsigned long) ioremap(EPSON1355FB_REGS_PHYS, EPSON1355FB_REGS_LEN);
Expand Down

0 comments on commit 84f550a

Please sign in to comment.