| Message ID | 20210114130316.803231-1-ribalda@chromium.org |
|---|---|
| State | Accepted |
| Commit | e081863ab48d9b2eee9e899cbd05752a2a30308d |
| Headers | show |
| Series | media: hantro: Fix reset_raw_fmt initialization | expand |
Hi Gustavo On Mon, Jan 18, 2021 at 11:26 PM Gustavo A. R. Silva <gustavo@embeddedor.com> wrote: > > Hey Ricardo, > > On 1/14/21 07:03, Ricardo Ribalda wrote: > > raw_fmt->height in never initialized. But width in initialized twice. > > Nice catch! Thanks :) > > How did you find this? Pure luck. I was backporting a patch and the duplicated line hit my eye. Maybe we could just search for duplicated lines in the codebase. I guess it is not the only c&p issue we have > > > Fixes: 88d06362d1d05 ("media: hantro: Refactor for V4L2 API spec compliancy") > > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> > > This should be tagged for -stable: > > Cc: stable@vger.kernel.org > > -- > Gustavo > > > --- > > drivers/staging/media/hantro/hantro_v4l2.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/staging/media/hantro/hantro_v4l2.c b/drivers/staging/media/hantro/hantro_v4l2.c > > index b668a82d40ad..f5fbdbc4ffdb 100644 > > --- a/drivers/staging/media/hantro/hantro_v4l2.c > > +++ b/drivers/staging/media/hantro/hantro_v4l2.c > > @@ -367,7 +367,7 @@ hantro_reset_raw_fmt(struct hantro_ctx *ctx) > > > > hantro_reset_fmt(raw_fmt, raw_vpu_fmt); > > raw_fmt->width = encoded_fmt->width; > > - raw_fmt->width = encoded_fmt->width; > > + raw_fmt->height = encoded_fmt->height; > > if (ctx->is_encoder) > > hantro_set_fmt_out(ctx, raw_fmt); > > else > > -- Ricardo Ribalda
diff --git a/drivers/staging/media/hantro/hantro_v4l2.c b/drivers/staging/media/hantro/hantro_v4l2.c index b668a82d40ad..f5fbdbc4ffdb 100644 --- a/drivers/staging/media/hantro/hantro_v4l2.c +++ b/drivers/staging/media/hantro/hantro_v4l2.c @@ -367,7 +367,7 @@ hantro_reset_raw_fmt(struct hantro_ctx *ctx) hantro_reset_fmt(raw_fmt, raw_vpu_fmt); raw_fmt->width = encoded_fmt->width; - raw_fmt->width = encoded_fmt->width; + raw_fmt->height = encoded_fmt->height; if (ctx->is_encoder) hantro_set_fmt_out(ctx, raw_fmt); else
raw_fmt->height in never initialized. But width in initialized twice. Fixes: 88d06362d1d05 ("media: hantro: Refactor for V4L2 API spec compliancy") Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> --- drivers/staging/media/hantro/hantro_v4l2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)