From mboxrd@z Thu Jan 1 00:00:00 1970 From: Darren Etheridge Date: Tue, 25 Jun 2013 14:22:48 +0000 Subject: [PATCH 20/23] video: da8xx-fb: ensure pdata only for non-dt Message-Id: <1372170171-9561-21-git-send-email-detheridge@ti.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-fbdev@vger.kernel.org From: Afzal Mohammed This driver is DT probe-able, hence ensure presence of platform data only for non-DT boot. Signed-off-by: Afzal Mohammed Signed-off-by: Darren Etheridge --- drivers/video/da8xx-fb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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.0.4