44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
From e575bca2b5e1e44a23b435711219e3941878dcb4 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Thu, 7 Jan 2021 11:41:26 +0000
|
|
Subject: [PATCH] staging/bcm2835-codec: Log the number of excess
|
|
supported formats
|
|
|
|
When logging that the firmware has provided more supported formats
|
|
than we had allocated storage for, log the number allocated and
|
|
returned.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
.../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 12 ++++++++----
|
|
1 file changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
|
|
+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
|
|
@@ -2836,8 +2836,10 @@ static int bcm2835_codec_get_supported_f
|
|
|
|
if (ret) {
|
|
if (ret == MMAL_MSG_STATUS_ENOSPC) {
|
|
- v4l2_err(&dev->v4l2_dev, "%s: port has more encoding than we provided space for. Some are dropped.\n",
|
|
- __func__);
|
|
+ v4l2_err(&dev->v4l2_dev,
|
|
+ "%s: port has more encodings than we provided space for. Some are dropped (%u vs %u).\n",
|
|
+ __func__, param_size / sizeof(u32),
|
|
+ MAX_SUPPORTED_ENCODINGS);
|
|
num_encodings = MAX_SUPPORTED_ENCODINGS;
|
|
} else {
|
|
v4l2_err(&dev->v4l2_dev, "%s: get_param ret %u.\n",
|
|
@@ -2880,8 +2882,10 @@ static int bcm2835_codec_get_supported_f
|
|
|
|
if (ret) {
|
|
if (ret == MMAL_MSG_STATUS_ENOSPC) {
|
|
- v4l2_err(&dev->v4l2_dev, "%s: port has more encoding than we provided space for. Some are dropped.\n",
|
|
- __func__);
|
|
+ v4l2_err(&dev->v4l2_dev,
|
|
+ "%s: port has more encodings than we provided space for. Some are dropped (%u vs %u).\n",
|
|
+ __func__, param_size / sizeof(u32),
|
|
+ MAX_SUPPORTED_ENCODINGS);
|
|
num_encodings = MAX_SUPPORTED_ENCODINGS;
|
|
} else {
|
|
ret = -EINVAL;
|