From patchwork Mon Mar 5 16:48:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 7097 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id F2B1523DC3 for ; Mon, 5 Mar 2012 16:49:22 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id BB1DDA1810C for ; Mon, 5 Mar 2012 16:49:22 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so7746420iag.11 for ; Mon, 05 Mar 2012 08:49:22 -0800 (PST) MIME-Version: 1.0 Received: by 10.50.197.135 with SMTP id iu7mr6192571igc.50.1330966162573; Mon, 05 Mar 2012 08:49:22 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.53.18 with SMTP id k18csp30889ibg; Mon, 5 Mar 2012 08:49:22 -0800 (PST) Received: by 10.236.168.41 with SMTP id j29mr242042yhl.24.1330966161745; Mon, 05 Mar 2012 08:49:21 -0800 (PST) Received: from mail-gy0-f178.google.com (mail-gy0-f178.google.com [209.85.160.178]) by mx.google.com with ESMTPS id d9si16881028yhn.135.2012.03.05.08.49.21 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Mar 2012 08:49:21 -0800 (PST) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.160.178 as permitted sender) client-ip=209.85.160.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.160.178 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass header.i=@gmail.com Received: by mail-gy0-f178.google.com with SMTP id f1so2032935ghb.37 for ; Mon, 05 Mar 2012 08:49:21 -0800 (PST) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 10.236.185.168 as permitted sender) client-ip=10.236.185.168; Received: from mr.google.com ([10.236.185.168]) by 10.236.185.168 with SMTP id u28mr28179815yhm.73.1330966161594 (num_hops = 1); Mon, 05 Mar 2012 08:49:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=i3w5rQ/d1zs8MLihW3nkcNnAqpRXZYz4FYoU7IKrZ2I=; b=v7Y4O8HdzUiPAgG6zgsrPr1dBlvREbs/wEkxN7Ct1CmpkslJQYlijtSbho5lT1hNz1 chLxwlBYEii58LC/yqZj+5Au+7Yva+j10aNFrXwt1jWS/n1qDkvZPmxvhgf3RNiX+u3o 179r8W4GBuvnDFoP690QRdelU/m04UsZLnCAD11Z47xy2Urd8Hg77PVZIBMAzT8JAVZU xknV7Ausf72bO2PydVGE8dlB4zcAdXqfqPyVrSuFXno0pQ0Al+vUsMl7gaZKgdJEpm3r VFA1WikTCPM6nP7RSZWWh8sfGG1AEqCD3ZbQf17quFVxxA03ovUgrPTde9WwoG5YXvKj Kugw== Received: by 10.236.185.168 with SMTP id u28mr22179153yhm.73.1330966161536; Mon, 05 Mar 2012 08:49:21 -0800 (PST) Received: from localhost (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id g21sm25359528ani.13.2012.03.05.08.49.20 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Mar 2012 08:49:21 -0800 (PST) Sender: Rob Clark From: Rob Clark To: dri-devel@lists.freedesktop.org, linux-omap@vger.kernel.org Cc: patches@linaro.org, Greg KH , Tomi Valkeinen , Andy Gross , Rob Clark Subject: [PATCH 08/10] staging: drm/omap: Validate debugfs device Date: Mon, 5 Mar 2012 10:48:38 -0600 Message-Id: <1330966120-28582-9-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1330966120-28582-1-git-send-email-rob.clark@linaro.org> References: <1330966120-28582-1-git-send-email-rob.clark@linaro.org> X-Gm-Message-State: ALoCoQkVdYIkzKEPU62kGfnL2CS7QafMUH5T5PdYUhkSMc+e7zvTxFV9hoMGQdJNpMnNm3U5JzFx From: Andy Gross Added check for valid device information before dumping debugfs information. Signed-off-by: Andy Gross Signed-off-by: Rob Clark --- drivers/staging/omapdrm/omap_dmm_tiler.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.c b/drivers/staging/omapdrm/omap_dmm_tiler.c index 852d944..e4c7bb6 100644 --- a/drivers/staging/omapdrm/omap_dmm_tiler.c +++ b/drivers/staging/omapdrm/omap_dmm_tiler.c @@ -766,10 +766,18 @@ int tiler_map_show(struct seq_file *s, void *arg) const char *a2d = special; const char *m2dp = m2d, *a2dp = a2d; char nice[128]; - int h_adj = omap_dmm->lut_height / ydiv; - int w_adj = omap_dmm->lut_width / xdiv; + int h_adj; + int w_adj; unsigned long flags; + if (!omap_dmm) { + /* early return if dmm/tiler device is not initialized */ + return 0; + } + + h_adj = omap_dmm->lut_height / ydiv; + w_adj = omap_dmm->lut_width / xdiv; + map = kzalloc(h_adj * sizeof(*map), GFP_KERNEL); global_map = kzalloc((w_adj + 1) * h_adj, GFP_KERNEL);