From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Peter Meerwald <pmeerw@pmeerw.net>, linux-omap@vger.kernel.org
Cc: linux-fbdev@vger.kernel.org
Subject: Re: [PATCH] omapfb: Return error code when applying overlay settings fails
Date: Wed, 04 Feb 2015 10:42:41 +0000 [thread overview]
Message-ID: <54D1F7A1.3010309@ti.com> (raw)
In-Reply-To: <1422604786-6804-1-git-send-email-pmeerw@pmeerw.net>
[-- Attachment #1: Type: text/plain, Size: 1179 bytes --]
On 30/01/15 09:59, Peter Meerwald wrote:
> the check of the return code is missing, user space does not get notified
> about the error condition:
>
> omapdss OVERLAY error: overlay 2 horizontally not inside the display area (403 + 800 >= 800)
> omapdss APPLY error: failed to apply settings: illegal configuration.
>
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
> ---
> drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c b/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
> index 146b6f5..9ddfdd6 100644
> --- a/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
> +++ b/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
> @@ -137,8 +137,11 @@ static int omapfb_setup_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
> goto undo;
> }
>
> - if (ovl->manager)
> - ovl->manager->apply(ovl->manager);
> + if (ovl->manager) {
> + r = ovl->manager->apply(ovl->manager);
> + if (r)
> + goto undo;
> + }
>
> if (pi->enabled) {
> r = ovl->enable(ovl);
>
Thanks, queued for 3.20.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
prev parent reply other threads:[~2015-02-04 10:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-30 7:59 [PATCH] omapfb: Return error code when applying overlay settings fails Peter Meerwald
2015-02-04 10:42 ` Tomi Valkeinen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54D1F7A1.3010309@ti.com \
--to=tomi.valkeinen@ti.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).