From patchwork Mon Jan 28 09:21:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Afzal Mohammed X-Patchwork-Id: 2053841 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id A30CEE01F5 for ; Mon, 28 Jan 2013 09:22:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756410Ab3A1JVv (ORCPT ); Mon, 28 Jan 2013 04:21:51 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:58136 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756374Ab3A1JVr (ORCPT ); Mon, 28 Jan 2013 04:21:47 -0500 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id r0S9LcdZ007087; Mon, 28 Jan 2013 03:21:39 -0600 Received: from DBDE71.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0S9Lbnc013102; Mon, 28 Jan 2013 14:51:37 +0530 (IST) Received: from dbdp32.itg.ti.com (172.24.170.251) by DBDE71.ent.ti.com (172.24.170.149) with Microsoft SMTP Server id 14.1.323.3; Mon, 28 Jan 2013 14:51:37 +0530 Received: from psplinux063.india.ti.com (dbdp20.itg.ti.com [172.24.170.38]) by dbdp32.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0S9LbmM023331; Mon, 28 Jan 2013 14:51:37 +0530 From: Afzal Mohammed To: , , , , CC: Florian Tobias Schandinat , Tomi Valkeinen , Grant Likely , Rob Herring , Rob Landley , Mike Turquette Subject: [PATCH v5 10/12] video: da8xx-fb: ensure pdata only for non-dt Date: Mon, 28 Jan 2013 14:51:36 +0530 Message-ID: <7b6a238cea5097bb1b92b03bb78a0b53b423cec5.1359356015.git.afzal@ti.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@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; }