From 938750549172477a8de2b52efa12295457e4d25e Mon Sep 17 00:00:00 2001 From: Andy Gross Date: Mon, 5 Mar 2012 10:48:38 -0600 Subject: [PATCH] --- yaml --- r: 289202 b: refs/heads/master c: 02646fb8b3de95a170f8ac4f0773a4f5e2a1b54c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/omapdrm/omap_dmm_tiler.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a4beb197619b..bf1c9af355cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 132390c79e01b3da732bc7b5d9e729b52086ceb6 +refs/heads/master: 02646fb8b3de95a170f8ac4f0773a4f5e2a1b54c diff --git a/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c b/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c index 852d9440f725..e4c7bb6afce4 100644 --- a/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c +++ b/trunk/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);