ipu3-cio2: Check receved the size against payload size, not buffer size
Subsystems (2)
Sakari Ailus
maintainerPATCH v2 1/1 ipu3-cio2: Check receved the size against payload size, not buffer size
Compare the received size of the payload size, not the allocated size of the buffer that is page aligned. This way also images that aren't aligned to page size are not warned about.
Also wrap a line over 80 characters.
Suggested-by Laurent Pinchart <[email protected]>
Signed-off-by Sakari Ailus <[email protected]>
Reviewed-by Laurent Pinchart <[email protected]>
Tested-by Jean-Michel Hautbois <[email protected]>
---
since v1:
- Use local variable for payload, rename bytes as received
- Add a comma to the warning message
drivers/media/pci/intel/ipu3/ipu3-cio2.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/media/pci/intel/ipu3/ipu3-cio2.c +7 -5
@@ -561,7 +561,9 @@ static void cio2_buffer_done(struct cio2_device *cio2, unsigned int dma_chan) b = q->bufs[q->bufs_first];if (b) { -unsigned int bytes = entry[1 ].second_entry.num_of_bytes; +unsigned int received = entry[1 ].second_entry.num_of_bytes; +unsigned long payload = +vb2_get_plane_payload (&b->vbb.vb2_buf,0 ); q->bufs[q->bufs_first] =NULL ;atomic_dec (&q->bufs_queued);
@@ -571,10 +573,10 @@ static void cio2_buffer_done(struct cio2_device *cio2, unsigned int dma_chan) b->vbb.vb2_buf.timestamp = ns; b->vbb.field =V4L2_FIELD_NONE ; b->vbb.sequence =atomic_read (&q->frame_sequence); -if (b->vbb.vb2_buf.planes[0 ].length != bytes) -dev_warn (dev,"buffer length is %d received %d\n" , - b->vbb.vb2_buf.planes[0 ].length, - bytes); +if (payload != received) +dev_warn (dev, +"payload length is %lu, received %u\n" , + payload, received);vb2_buffer_done (&b->vbb.vb2_buf,VB2_BUF_STATE_DONE ); }atomic_inc (&q->frame_sequence);
Signature · 1 line
2.27.0