diff options
| author | Florian Echtler <floe@butterbrot.org> | 2015-05-25 08:04:15 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-05-30 10:44:35 -0400 |
| commit | 0cfdfcc1db13c7b6b6f930ac0528d5b010f45220 (patch) | |
| tree | 9a481f5290ceb4ef040134c277e13f66ad584982 /drivers/input | |
| parent | da6e4674b0917d3a76ebb7938e6e2fa9532ce76f (diff) | |
[media] add extra debug output, remove noisy warning
Add dev_dbg statements for easier future debugging; also change the warning
about packet ID mismatches to debug output to avoid flooding the logs. This
warning is only important in a very specific/rare use case when trying to
correlate input events with video data.
Signed-off-by: Martin Kaltenbrunner <modin@yuri.at>
Signed-off-by: Florian Echtler <floe@butterbrot.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/sur40.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/sur40.c b/drivers/input/touchscreen/sur40.c index d860d056cccb..8add986abc82 100644 --- a/drivers/input/touchscreen/sur40.c +++ b/drivers/input/touchscreen/sur40.c | |||
| @@ -342,7 +342,7 @@ static void sur40_poll(struct input_polled_dev *polldev) | |||
| 342 | * instead of at the end. | 342 | * instead of at the end. |
| 343 | */ | 343 | */ |
| 344 | if (packet_id != header->packet_id) | 344 | if (packet_id != header->packet_id) |
| 345 | dev_warn(sur40->dev, "packet ID mismatch\n"); | 345 | dev_dbg(sur40->dev, "packet ID mismatch\n"); |
| 346 | 346 | ||
| 347 | packet_blobs = result / sizeof(struct sur40_blob); | 347 | packet_blobs = result / sizeof(struct sur40_blob); |
| 348 | dev_dbg(sur40->dev, "received %d blobs\n", packet_blobs); | 348 | dev_dbg(sur40->dev, "received %d blobs\n", packet_blobs); |
| @@ -389,6 +389,8 @@ static void sur40_process_video(struct sur40_state *sur40) | |||
| 389 | list_del(&new_buf->list); | 389 | list_del(&new_buf->list); |
| 390 | spin_unlock(&sur40->qlock); | 390 | spin_unlock(&sur40->qlock); |
| 391 | 391 | ||
| 392 | dev_dbg(sur40->dev, "buffer acquired\n"); | ||
| 393 | |||
| 392 | /* retrieve data via bulk read */ | 394 | /* retrieve data via bulk read */ |
| 393 | result = usb_bulk_msg(sur40->usbdev, | 395 | result = usb_bulk_msg(sur40->usbdev, |
| 394 | usb_rcvbulkpipe(sur40->usbdev, VIDEO_ENDPOINT), | 396 | usb_rcvbulkpipe(sur40->usbdev, VIDEO_ENDPOINT), |
| @@ -416,6 +418,8 @@ static void sur40_process_video(struct sur40_state *sur40) | |||
| 416 | goto err_poll; | 418 | goto err_poll; |
| 417 | } | 419 | } |
| 418 | 420 | ||
| 421 | dev_dbg(sur40->dev, "header acquired\n"); | ||
| 422 | |||
| 419 | sgt = vb2_dma_sg_plane_desc(&new_buf->vb, 0); | 423 | sgt = vb2_dma_sg_plane_desc(&new_buf->vb, 0); |
| 420 | 424 | ||
| 421 | result = usb_sg_init(&sgr, sur40->usbdev, | 425 | result = usb_sg_init(&sgr, sur40->usbdev, |
| @@ -432,11 +436,14 @@ static void sur40_process_video(struct sur40_state *sur40) | |||
| 432 | goto err_poll; | 436 | goto err_poll; |
| 433 | } | 437 | } |
| 434 | 438 | ||
| 439 | dev_dbg(sur40->dev, "image acquired\n"); | ||
| 440 | |||
| 435 | /* mark as finished */ | 441 | /* mark as finished */ |
| 436 | v4l2_get_timestamp(&new_buf->vb.v4l2_buf.timestamp); | 442 | v4l2_get_timestamp(&new_buf->vb.v4l2_buf.timestamp); |
| 437 | new_buf->vb.v4l2_buf.sequence = sur40->sequence++; | 443 | new_buf->vb.v4l2_buf.sequence = sur40->sequence++; |
| 438 | new_buf->vb.v4l2_buf.field = V4L2_FIELD_NONE; | 444 | new_buf->vb.v4l2_buf.field = V4L2_FIELD_NONE; |
| 439 | vb2_buffer_done(&new_buf->vb, VB2_BUF_STATE_DONE); | 445 | vb2_buffer_done(&new_buf->vb, VB2_BUF_STATE_DONE); |
| 446 | dev_dbg(sur40->dev, "buffer marked done\n"); | ||
| 440 | return; | 447 | return; |
| 441 | 448 | ||
| 442 | err_poll: | 449 | err_poll: |
