From fc7a0c3850f3a31e68f4505bef0e0f7145e292fb Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Mon, 13 Apr 2009 14:39:44 -0700 Subject: [PATCH] --- yaml --- r: 143191 b: refs/heads/master c: 133bb070e94ab41d750c6f2160c8843e46f11b78 h: refs/heads/master i: 143189: f77b560200d445d43992c6adcb6e0c164e630246 143187: a583d627a9d7aa926531aa0d85eda8a9b013f25b 143183: 42922b3e479249324b5220b7b49042795f48e5bc v: v3 --- [refs] | 2 +- trunk/drivers/video/efifb.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1d96751ab439..e4799258a8f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ca1071f7dbd673de826eb3fb01bfdfd1d423433 +refs/heads/master: 133bb070e94ab41d750c6f2160c8843e46f11b78 diff --git a/trunk/drivers/video/efifb.c b/trunk/drivers/video/efifb.c index 0c5b9a9fd56f..8dea2bc92705 100644 --- a/trunk/drivers/video/efifb.c +++ b/trunk/drivers/video/efifb.c @@ -210,12 +210,15 @@ static int __init efifb_probe(struct platform_device *dev) unsigned int size_total; int request_succeeded = 0; - printk(KERN_INFO "efifb: probing for efifb\n"); - if (!screen_info.lfb_depth) screen_info.lfb_depth = 32; if (!screen_info.pages) screen_info.pages = 1; + if (!screen_info.lfb_base) { + printk(KERN_DEBUG "efifb: invalid framebuffer address\n"); + return -ENODEV; + } + printk(KERN_INFO "efifb: probing for efifb\n"); /* just assume they're all unset if any are */ if (!screen_info.blue_size) {