History

Merge branch 'topic/kbuild-fixes-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media build fixes from Mauro Carvalho Chehab: "A series of patches that fix compilation on non-x86 archs. While most of them are just build fixes, there are some fixes for real bugs, as there are a number of drivers using dynamic stack allocation. A few of those might be considered a security risk, if the i2c-dev module is loaded, as someone could be sending very long I2C data that could potentially overflow the Kernel stack. Ok, as using /dev/i2c-* devnodes usually requires root on usual distros, and exploiting it would require a DVB board or USB stick, the risk is not high" * 'topic/kbuild-fixes-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (28 commits) [media] platform drivers: Fix build on frv arch [media] lirc_zilog: Don't use dynamic static allocation [media] mxl111sf: Don't use dynamic static allocation [media] af9035: Don't use dynamic static allocation [media] af9015: Don't use dynamic static allocation [media] dw2102: Don't use dynamic static allocation [media] dibusb-common: Don't use dynamic static allocation [media] cxusb: Don't use dynamic static allocation [media] v4l2-async: Don't use dynamic static allocation [media] cimax2: Don't use dynamic static allocation [media] tuner-xc2028: Don't use dynamic static allocation [media] tuners: Don't use dynamic static allocation [media] av7110_hw: Don't use dynamic static allocation [media] stv090x: Don't use dynamic static allocation [media] stv0367: Don't use dynamic static allocation [media] stb0899_drv: Don't use dynamic static allocation [media] dvb-frontends: Don't use dynamic static allocation [media] dvb-frontends: Don't use dynamic static allocation [media] s5h1420: Don't use dynamic static allocation [media] uvc/lirc_serial: Fix some warnings on parisc arch ...

Linus Torvalds committed 12 years ago

Commit 3ea369e2 parents a310410 3cdcf7347 files · +610 −119Browse files

Showing the changes to drivers/staging/media/lirc/lirc_serial.c (1 of 47 files). Show all

Unified · Split

drivers/staging/media/lirc/lirc_serial.c+6−3
@@ -707,7 +707,8 @@ static irqreturn_t irq_handler(int i, void *blah) · 706 unmodified lines
707707 pr_warn("ignoring spike: %d %d %lx %lx %lx %lx\n",
708708 dcd, sense,
709709 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);
711712 continue;
712713 }
713714
@@ -719,7 +720,8 @@ static irqreturn_t irq_handler(int i, void *blah) · 5 unmodified lines
719720 pr_warn("%d %d %lx %lx %lx %lx\n",
720721 dcd, sense,
721722 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);
723725 data = PULSE_MASK;
724726 } else if (deltv > 15) {
725727 data = PULSE_MASK; /* really long time */
@@ -728,7 +730,8 @@ static irqreturn_t irq_handler(int i, void *blah) · 2 unmodified lines
728730 pr_warn("AIEEEE: %d %d %lx %lx %lx %lx\n",
729731 dcd, sense,
730732 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);
732735 /*
733736 * detecting pulse while this
734737 * MUST be a space!