diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-08-21 00:20:14 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-08-21 00:20:14 -0700 |
| commit | 468ba7b8f93d584586a0b31aaeadb890ce60068b (patch) | |
| tree | ee9b03725c2728afb173e730165a674e85792e1b /drivers/video/fbdev | |
| parent | 5883338fd90e39d43f24134d58b64ea416b0e836 (diff) | |
| parent | 899e6b960577c6150d4422935990af8ffb0e78bc (diff) | |
Merge "Merge android-4.4@9f764bb (v4.4.80) into msm-4.4"
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/cobalt_lcdfb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/fbdev/cobalt_lcdfb.c b/drivers/video/fbdev/cobalt_lcdfb.c index 07675d6f323e..d4530b54479c 100644 --- a/drivers/video/fbdev/cobalt_lcdfb.c +++ b/drivers/video/fbdev/cobalt_lcdfb.c @@ -350,6 +350,11 @@ static int cobalt_lcdfb_probe(struct platform_device *dev) info->screen_size = resource_size(res); info->screen_base = devm_ioremap(&dev->dev, res->start, info->screen_size); + if (!info->screen_base) { + framebuffer_release(info); + return -ENOMEM; + } + info->fbops = &cobalt_lcd_fbops; info->fix = cobalt_lcdfb_fix; info->fix.smem_start = res->start; |