From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Sep 2015 01:21:14 +0000 (-0700)
Subject: Merge tag 'media/v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v4.3-rc1~68
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9cfcc658da9693f65e7224e8329e40ada2f3c699;p=linux.git

Merge tag 'media/v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:
 - new DVB frontend drivers: ascot2e, cxd2841er, horus3a, lnbh25
 - new HDMI capture driver: tc358743
 - new driver for NetUP DVB new boards (netup_unidvb)
 - IR support for DVBSky cards (smipcie-ir)
 - Coda driver has gain macroblock tiling support
 - Renesas R-Car gains JPEG codec driver
 - new DVB platform driver for STi boards: c8sectpfe
 - added documentation for the media core kABI to device-drivers DocBook
 - lots of driver fixups, cleanups and improvements

* tag 'media/v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (297 commits)
  [media] c8sectpfe: Remove select on undefined LIBELF_32
  [media] i2c: fix platform_no_drv_owner.cocci warnings
  [media] cx231xx: Use wake_up_interruptible() instead of wake_up_interruptible_nr()
  [media] tc358743: only queue subdev notifications if devnode is set
  [media] tc358743: add missing Kconfig dependency/select
  [media] c8sectpfe: Use %pad to print 'dma_addr_t'
  [media] DocBook media: Fix typo "the the" in xml files
  [media] tc358743: make reset gpio optional
  [media] tc358743: set direction of reset gpio using devm_gpiod_get
  [media] dvbdev: document most of the functions/data structs
  [media] dvb_frontend.h: document the struct dvb_frontend
  [media] dvb-frontend.h: document struct dtv_frontend_properties
  [media] dvb-frontend.h: document struct dvb_frontend_ops
  [media] dvb: Use DVBFE_ALGO_HW where applicable
  [media] dvb_frontend.h: document struct analog_demod_ops
  [media] dvb_frontend.h: Document struct dvb_tuner_ops
  [media] Docbook: Document struct analog_parameters
  [media] dvb_frontend.h: get rid of dvbfe_modcod
  [media] add documentation for struct dvb_tuner_info
  [media] dvb_frontend: document dvb_frontend_tune_settings
  ...
---

9cfcc658da9693f65e7224e8329e40ada2f3c699
diff --cc MAINTAINERS
index a9abe32f8e14,e0946a0ec620..4d8c8e10fb39
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1522,9 -1503,9 +1522,10 @@@ S:	Maintaine
  F:	arch/arm/mach-sti/
  F:	arch/arm/boot/dts/sti*
  F:	drivers/clocksource/arm_global_timer.c
 +F:	drivers/clocksource/clksrc_st_lpc.c
  F:	drivers/i2c/busses/i2c-st.c
  F:	drivers/media/rc/st_rc.c
+ F:	drivers/media/platform/sti/c8sectpfe/
  F:	drivers/mmc/host/sdhci-st.c
  F:	drivers/phy/phy-miphy28lp.c
  F:	drivers/phy/phy-miphy365x.c
diff --cc drivers/media/v4l2-core/videobuf2-core.c
index a14c428f70e9,b866a6becd99..f1022d810d22
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@@ -1213,10 -1209,9 +1215,12 @@@ void vb2_buffer_done(struct vb2_buffer 
  	atomic_dec(&q->owned_by_drv_count);
  	spin_unlock_irqrestore(&q->done_lock, flags);
  
+ 	trace_vb2_buf_done(q, vb);
+ 
 -	if (state == VB2_BUF_STATE_QUEUED) {
 +	switch (state) {
 +	case VB2_BUF_STATE_QUEUED:
 +		return;
 +	case VB2_BUF_STATE_REQUEUEING:
  		if (q->start_streaming_called)
  			__enqueue_in_driver(vb);
  		return;