From 84f550af3ce21a7ddee2805ce98bbf851fa4033c Mon Sep 17 00:00:00 2001 From: Roland Stigge Date: Tue, 8 May 2007 00:38:31 -0700 Subject: [PATCH] --- yaml --- r: 54910 b: refs/heads/master c: 19f3d3a5546be431f3846d8a8581e7a2f169dba3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/epson1355fb.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c20d3bef7064..3675bf8c43cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c930faaed551aac898c618a7df1d68901ff244f0 +refs/heads/master: 19f3d3a5546be431f3846d8a8581e7a2f169dba3 diff --git a/trunk/drivers/video/epson1355fb.c b/trunk/drivers/video/epson1355fb.c index 29e07c109887..37e297d7feb7 100644 --- a/trunk/drivers/video/epson1355fb.c +++ b/trunk/drivers/video/epson1355fb.c @@ -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);