From: Peter Robinson <pbrobinson@gmail.com>
To: Stefan Wahren <wahrenst@gmx.net>
Cc: devel@driverdev.osuosl.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Madhumitha Prabakaran <madhumithabiw@gmail.com>,
Eric Anholt <eric@anholt.net>,
linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] staging: bcm2835-camera: Restore return behavior of ctrl_set_bitrate()
Date: Tue, 25 Jun 2019 08:36:39 +0100 [thread overview]
Message-ID: <CALeDE9N-j_mSubddpsQ24905Ti3YHfPAECsRaxdW4sQv3K6w+Q@mail.gmail.com> (raw)
In-Reply-To: <1561414395-12518-1-git-send-email-wahrenst@gmx.net>
On Mon, Jun 24, 2019 at 11:13 PM Stefan Wahren <wahrenst@gmx.net> wrote:
>
> The commit 52c4dfcead49 ("Staging: vc04_services: Cleanup in
> ctrl_set_bitrate()") changed the return behavior of ctrl_set_bitrate().
> This breaks probing of bcm2835-camera:
>
> bcm2835-v4l2: mmal_init: failed to set all camera controls: -3
> Cleanup: Destroy video encoder
> Cleanup: Destroy image encoder
> Cleanup: Destroy video render
> Cleanup: Destroy camera
> bcm2835-v4l2: bcm2835_mmal_probe: mmal init failed: -3
> bcm2835-camera: probe of bcm2835-camera failed with error -3
>
> So restore the old behavior and fix this issue.
>
> Fixes: 52c4dfcead49 ("Staging: vc04_services: Cleanup in ctrl_set_bitrate()")
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Tested-by: Peter Robinson <pbrobinson@gmail.com>
Thanks Stefan, I can confirm this resolves the issue I have seen with
the camera on 5.2 but hadn't had the time to bisect it yet.
Tested with a v2.1 camera module attached to a RPI3A+
Regards,
Peter
> ---
> drivers/staging/vc04_services/bcm2835-camera/controls.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
> index d60e378..1c4c9e8 100644
> --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
> +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
> @@ -610,9 +610,11 @@ static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev,
>
> encoder_out = &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0];
>
> - return vchiq_mmal_port_parameter_set(dev->instance, encoder_out,
> - mmal_ctrl->mmal_id, &ctrl->val,
> - sizeof(ctrl->val));
> + vchiq_mmal_port_parameter_set(dev->instance, encoder_out,
> + mmal_ctrl->mmal_id, &ctrl->val,
> + sizeof(ctrl->val));
> +
> + return 0;
> }
>
> static int ctrl_set_bitrate_mode(struct bm2835_mmal_dev *dev,
> --
> 2.7.4
>
>
> _______________________________________________
> linux-rpi-kernel mailing list
> linux-rpi-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-rpi-kernel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-06-25 7:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 22:13 [PATCH] staging: bcm2835-camera: Restore return behavior of ctrl_set_bitrate() Stefan Wahren
2019-06-25 7:36 ` Peter Robinson [this message]
2019-06-25 7:55 ` Dan Carpenter
2019-06-25 16:29 ` Stefan Wahren
2019-06-26 10:42 ` Dave Stevenson
2019-06-27 7:06 ` Peter Robinson
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=CALeDE9N-j_mSubddpsQ24905Ti3YHfPAECsRaxdW4sQv3K6w+Q@mail.gmail.com \
--to=pbrobinson@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=eric@anholt.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=madhumithabiw@gmail.com \
--cc=wahrenst@gmx.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).