From patchwork Mon Nov 14 08:28:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 8414 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1RPrup-0003VN-U1; Mon, 14 Nov 2011 09:29:20 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-1) with esmtp id 1RPruo-0006ZD-MS; Mon, 14 Nov 2011 09:29:19 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752858Ab1KNI3Q (ORCPT + 3 others); Mon, 14 Nov 2011 03:29:16 -0500 Received: from na3sys009aog122.obsmtp.com ([74.125.149.147]:43675 "EHLO na3sys009aog122.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752304Ab1KNI3Q (ORCPT ); Mon, 14 Nov 2011 03:29:16 -0500 Received: from mail-bw0-f47.google.com ([209.85.214.47]) (using TLSv1) by na3sys009aob122.postini.com ([74.125.148.12]) with SMTP ID DSNKTsDRW+IO0PJhuR7AbU0XCo4GgFU+9iNn@postini.com; Mon, 14 Nov 2011 00:29:16 PST Received: by mail-bw0-f47.google.com with SMTP id zs2so6500096bkb.20 for ; Mon, 14 Nov 2011 00:29:15 -0800 (PST) Received: by 10.205.117.10 with SMTP id fk10mr18298197bkc.29.1321259354660; Mon, 14 Nov 2011 00:29:14 -0800 (PST) Received: from localhost.localdomain (a62-248-128-208.elisa-laajakaista.fi. [62.248.128.208]) by mx.google.com with ESMTPS id a4sm20730716bkq.13.2011.11.14.00.29.12 (version=SSLv3 cipher=OTHER); Mon, 14 Nov 2011 00:29:13 -0800 (PST) From: Tomi Valkeinen To: linux-media@vger.kernel.org, hvaibhav@ti.com Cc: archit@ti.com, Tomi Valkeinen Subject: [PATCH] omap_vout: fix crash if no driver for a display Date: Mon, 14 Nov 2011 10:28:59 +0200 Message-Id: <1321259339-5202-1-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.4.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.11.14.81516 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1100_1199 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' X-LSpam-Score: -4.2 (----) X-LSpam-Report: No, score=-4.2 required=5.0 tests=BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3 autolearn=ham omap_vout crashes on start if a corresponding driver is not loaded for a display device. This patch changes omap_vout init sequence to skip devices without a driver. Signed-off-by: Tomi Valkeinen Acked-by: Vaibhav Hiremath --- drivers/media/video/omap/omap_vout.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index 9c5c19f..2d2a136 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/drivers/media/video/omap/omap_vout.c @@ -2169,6 +2169,14 @@ static int __init omap_vout_probe(struct platform_device *pdev) vid_dev->num_displays = 0; for_each_dss_dev(dssdev) { omap_dss_get_device(dssdev); + + if (!dssdev->driver) { + dev_warn(&pdev->dev, "no driver for display: %s\n", + dssdev->name); + omap_dss_put_device(dssdev); + continue; + } + vid_dev->displays[vid_dev->num_displays++] = dssdev; }