aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/usb/uvc/uvc_video.c3
-rw-r--r--drivers/staging/media/lirc/lirc_serial.c9
2 files changed, 8 insertions, 4 deletions
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index 3394c3432011..899cb6d1c4a4 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -680,7 +680,8 @@ void uvc_video_clock_update(struct uvc_streaming *stream,
680 stream->dev->name, 680 stream->dev->name,
681 sof >> 16, div_u64(((u64)sof & 0xffff) * 1000000LLU, 65536), 681 sof >> 16, div_u64(((u64)sof & 0xffff) * 1000000LLU, 65536),
682 y, ts.tv_sec, ts.tv_nsec / NSEC_PER_USEC, 682 y, ts.tv_sec, ts.tv_nsec / NSEC_PER_USEC,
683 v4l2_buf->timestamp.tv_sec, v4l2_buf->timestamp.tv_usec, 683 v4l2_buf->timestamp.tv_sec,
684 (unsigned long)v4l2_buf->timestamp.tv_usec,
684 x1, first->host_sof, first->dev_sof, 685 x1, first->host_sof, first->dev_sof,
685 x2, last->host_sof, last->dev_sof, y1, y2); 686 x2, last->host_sof, last->dev_sof, y1, y2);
686 687
diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index af08e677b60f..7b3be2346b4b 100644
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -707,7 +707,8 @@ static irqreturn_t irq_handler(int i, void *blah)
707 pr_warn("ignoring spike: %d %d %lx %lx %lx %lx\n", 707 pr_warn("ignoring spike: %d %d %lx %lx %lx %lx\n",
708 dcd, sense, 708 dcd, sense,
709 tv.tv_sec, lasttv.tv_sec, 709 tv.tv_sec, lasttv.tv_sec,
710 tv.tv_usec, lasttv.tv_usec); 710 (unsigned long)tv.tv_usec,
711 (unsigned long)lasttv.tv_usec);
711 continue; 712 continue;
712 } 713 }
713 714
@@ -719,7 +720,8 @@ static irqreturn_t irq_handler(int i, void *blah)
719 pr_warn("%d %d %lx %lx %lx %lx\n", 720 pr_warn("%d %d %lx %lx %lx %lx\n",
720 dcd, sense, 721 dcd, sense,
721 tv.tv_sec, lasttv.tv_sec, 722 tv.tv_sec, lasttv.tv_sec,
722 tv.tv_usec, lasttv.tv_usec); 723 (unsigned long)tv.tv_usec,
724 (unsigned long)lasttv.tv_usec);
723 data = PULSE_MASK; 725 data = PULSE_MASK;
724 } else if (deltv > 15) { 726 } else if (deltv > 15) {
725 data = PULSE_MASK; /* really long time */ 727 data = PULSE_MASK; /* really long time */
@@ -728,7 +730,8 @@ static irqreturn_t irq_handler(int i, void *blah)
728 pr_warn("AIEEEE: %d %d %lx %lx %lx %lx\n", 730 pr_warn("AIEEEE: %d %d %lx %lx %lx %lx\n",
729 dcd, sense, 731 dcd, sense,
730 tv.tv_sec, lasttv.tv_sec, 732 tv.tv_sec, lasttv.tv_sec,
731 tv.tv_usec, lasttv.tv_usec); 733 (unsigned long)tv.tv_usec,
734 (unsigned long)lasttv.tv_usec);
732 /* 735 /*
733 * detecting pulse while this 736 * detecting pulse while this
734 * MUST be a space! 737 * MUST be a space!