Skip to content

Commit 8d9c51e

Browse files
committed
Merge tag 'media/v7.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab: - rc: igorplugusb: fix control request setup packet - vsp1: revert a couple patches to fix regressions when setting DRM pipelines * tag 'media/v7.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: media: rc: igorplugusb: fix control request setup packet Revert "media: renesas: vsp1: brx: Fix format propagation" Revert "media: renesas: vsp1: Initialize format on all pads"
2 parents 968966c + 171022c commit 8d9c51e

3 files changed

Lines changed: 4 additions & 10 deletions

File tree

drivers/media/platform/renesas/vsp1/vsp1_brx.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,20 +156,14 @@ static int brx_set_format(struct v4l2_subdev *subdev,
156156
compose->height = format->height;
157157
}
158158

159-
/*
160-
* Propagate the format code to all pads, and the whole format to the
161-
* source pad.
162-
*/
159+
/* Propagate the format code to all pads. */
163160
if (fmt->pad == BRX_PAD_SINK(0)) {
164161
unsigned int i;
165162

166-
for (i = 0; i < brx->entity.source_pad; ++i) {
163+
for (i = 0; i <= brx->entity.source_pad; ++i) {
167164
format = v4l2_subdev_state_get_format(state, i);
168165
format->code = fmt->format.code;
169166
}
170-
171-
format = v4l2_subdev_state_get_format(state, i);
172-
*format = fmt->format;
173167
}
174168

175169
done:

drivers/media/platform/renesas/vsp1/vsp1_entity.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ static int vsp1_entity_init_state(struct v4l2_subdev *subdev,
380380
unsigned int pad;
381381

382382
/* Initialize all pad formats with default values. */
383-
for (pad = 0; pad < subdev->entity.num_pads; ++pad) {
383+
for (pad = 0; pad < subdev->entity.num_pads - 1; ++pad) {
384384
struct v4l2_subdev_format format = {
385385
.pad = pad,
386386
.which = sd_state ? V4L2_SUBDEV_FORMAT_TRY

drivers/media/rc/igorplugusb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ static int igorplugusb_probe(struct usb_interface *intf,
184184
if (!ir->buf_in)
185185
goto fail;
186186
usb_fill_control_urb(ir->urb, udev,
187-
usb_rcvctrlpipe(udev, 0), (uint8_t *)&ir->request,
187+
usb_rcvctrlpipe(udev, 0), (uint8_t *)ir->request,
188188
ir->buf_in, MAX_PACKET, igorplugusb_callback, ir);
189189

190190
usb_make_path(udev, ir->phys, sizeof(ir->phys));

0 commit comments

Comments
 (0)