From bacbddb22c275c1a6ad6722b9815489f0eb3f3b9 Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Mon, 3 Sep 2012 17:14:09 +0530 Subject: [PATCH] --- yaml --- r: 333594 b: refs/heads/master c: 0f0e4e3cd8030c3056e8f43196a112e887a545f9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/apply.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 912382b47faf..c818455d273c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80d81d64d6272a622ee6c9d0de871507daa52c89 +refs/heads/master: 0f0e4e3cd8030c3056e8f43196a112e887a545f9 diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c index 417b286132f5..4bd1c998e12d 100644 --- a/trunk/drivers/video/omap2/dss/apply.c +++ b/trunk/drivers/video/omap2/dss/apply.c @@ -1464,7 +1464,7 @@ int dss_ovl_enable(struct omap_overlay *ovl) goto err1; } - if (ovl->get_device(ovl) == NULL) { + if (ovl->manager == NULL || ovl->manager->output == NULL) { r = -EINVAL; goto err1; } @@ -1514,7 +1514,7 @@ int dss_ovl_disable(struct omap_overlay *ovl) goto err; } - if (ovl->get_device(ovl) == NULL) { + if (ovl->manager == NULL || ovl->manager->output == NULL) { r = -EINVAL; goto err; }