From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755938Ab3AWLs7 (ORCPT ); Wed, 23 Jan 2013 06:48:59 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:43279 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754682Ab3AWLsz (ORCPT ); Wed, 23 Jan 2013 06:48:55 -0500 From: Afzal Mohammed To: , , , , CC: Florian Tobias Schandinat , Tomi Valkeinen , Grant Likely , Rob Herring , Rob Landley , Mike Turquette Subject: [PATCH v4 10/12] video: da8xx-fb: ensure pdata only for non-dt Date: Wed, 23 Jan 2013 17:18:45 +0530 Message-ID: X-Mailer: git-send-email 1.7.12 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This driver is DT probe-able, hence ensure presence of platform data only for non-DT boot. Signed-off-by: Afzal Mohammed --- drivers/video/da8xx-fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c index 0c68712..1c1a616 100644 --- a/drivers/video/da8xx-fb.c +++ b/drivers/video/da8xx-fb.c @@ -1303,7 +1303,7 @@ static int fb_probe(struct platform_device *device) int ret; unsigned long ulcm; - if (fb_pdata == NULL) { + if (fb_pdata == NULL && !device->dev.of_node) { dev_err(&device->dev, "Can not get platform data\n"); return -ENOENT; } -- 1.7.12