Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de3796e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (46 commits)
  [media] rc: call input_sync after scancode reports
  [media] imon: allow either proto on unknown 0xffdc
  [media] imon: auto-config ffdc 7e device
  [media] saa7134: fix raw IR timeout value
  [media] rc: fix ghost keypresses with certain hw
  [media] [staging] lirc_serial: allocate irq at init time
  [media] lirc_zilog: fix spinning rx thread
  [media] keymaps: fix table for pinnacle pctv hd devices
  [media] ite-cir: 8709 needs to use pnp resource 2
  [media] V4L: mx1-camera: fix uninitialized variable
  [media] omap_vout: Added check in reqbuf & mmap for buf_size allocation
  [media] OMAP_VOUT: Change hardcoded device node number to -1
  [media] OMAP_VOUTLIB: Fix wrong resizer calculation
  [media] uvcvideo: Disable the queue when failing to start
  [media] uvcvideo: Remove buffers from the queues when freeing
  [media] uvcvideo: Ignore entities for terminals with no supported format
  [media] v4l: Don't access media entity after is has been destroyed
  [media] media: omap3isp: fix a potential NULL deref
  [media] media: vb2: fix allocation failure check
  [media] media: vb2: reset queued_count value during queue reinitialization
  ...

Fix up trivial conflict in MAINTAINERS as per Mauro
parents bcb65a79 98c32bcd

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -6733,6 +6733,7 @@ F: fs/fat/ 
VIDEOBUF2 FRAMEWORK

M:	Pawel Osciak <pawel@osciak.com>

M:	Marek Szyprowski <m.szyprowski@samsung.com>

M:	Kyungmin Park <kyungmin.park@samsung.com>

L:	linux-media@vger.kernel.org

S:	Maintained

F:	drivers/media/video/videobuf2-*

drivers/media/rc/fintek-cir.c

+5 −0
Original line number Diff line number Diff line
@@ -597,12 +597,17 @@ static void __devexit fintek_remove(struct pnp_dev *pdev) 
static int fintek_suspend(struct pnp_dev *pdev, pm_message_t state)

{

	struct fintek_dev *fintek = pnp_get_drvdata(pdev);

	unsigned long flags;



	fit_dbg("%s called", __func__);



	spin_lock_irqsave(&fintek->fintek_lock, flags);



	/* disable all CIR interrupts */

	fintek_cir_reg_write(fintek, CIR_STATUS_IRQ_MASK, CIR_STATUS);



	spin_unlock_irqrestore(&fintek->fintek_lock, flags);



	fintek_config_mode_enable(fintek);



	/* disable cir logical dev */

drivers/media/rc/imon.c

+17 −2
Original line number Diff line number Diff line
@@ -307,6 +307,14 @@ static const struct { 
	/* 0xffdc iMON MCE VFD */

	{ 0x00010000ffffffeell, KEY_VOLUMEUP },

	{ 0x01000000ffffffeell, KEY_VOLUMEDOWN },

	{ 0x00000001ffffffeell, KEY_MUTE },

	{ 0x0000000fffffffeell, KEY_MEDIA },

	{ 0x00000012ffffffeell, KEY_UP },

	{ 0x00000013ffffffeell, KEY_DOWN },

	{ 0x00000014ffffffeell, KEY_LEFT },

	{ 0x00000015ffffffeell, KEY_RIGHT },

	{ 0x00000016ffffffeell, KEY_ENTER },

	{ 0x00000017ffffffeell, KEY_ESC },

	/* iMON Knob values */

	{ 0x000100ffffffffeell, KEY_VOLUMEUP },

	{ 0x010000ffffffffeell, KEY_VOLUMEDOWN },
@@ -1582,16 +1590,16 @@ static void imon_incoming_packet(struct imon_context *ictx, 
	/* Only panel type events left to process now */

	spin_lock_irqsave(&ictx->kc_lock, flags);



	do_gettimeofday(&t);

	/* KEY_MUTE repeats from knob need to be suppressed */

	if (ictx->kc == KEY_MUTE && ictx->kc == ictx->last_keycode) {

		do_gettimeofday(&t);

		msec = tv2int(&t, &prev_time);

		prev_time = t;

		if (msec < ictx->idev->rep[REP_DELAY]) {

			spin_unlock_irqrestore(&ictx->kc_lock, flags);

			return;

		}

	}

	prev_time = t;

	kc = ictx->kc;



	spin_unlock_irqrestore(&ictx->kc_lock, flags);
@@ -1603,7 +1611,9 @@ static void imon_incoming_packet(struct imon_context *ictx, 
	input_report_key(ictx->idev, kc, 0);

	input_sync(ictx->idev);



	spin_lock_irqsave(&ictx->kc_lock, flags);

	ictx->last_keycode = kc;

	spin_unlock_irqrestore(&ictx->kc_lock, flags);



	return;
@@ -1740,6 +1750,8 @@ static void imon_get_ffdc_type(struct imon_context *ictx) 
		detected_display_type = IMON_DISPLAY_TYPE_VFD;

		break;

	/* iMON VFD, MCE IR */

	case 0x46:

	case 0x7e:

	case 0x9e:

		dev_info(ictx->dev, "0xffdc iMON VFD, MCE IR");

		detected_display_type = IMON_DISPLAY_TYPE_VFD;
@@ -1755,6 +1767,9 @@ static void imon_get_ffdc_type(struct imon_context *ictx) 
		dev_info(ictx->dev, "Unknown 0xffdc device, "

			 "defaulting to VFD and iMON IR");

		detected_display_type = IMON_DISPLAY_TYPE_VFD;

		/* We don't know which one it is, allow user to set the

		 * RC6 one from userspace if OTHER wasn't correct. */

		allowed_protos |= RC_TYPE_RC6;

		break;

	}

drivers/media/rc/ir-raw.c

+3 −1
Original line number Diff line number Diff line
@@ -114,18 +114,20 @@ int ir_raw_event_store_edge(struct rc_dev *dev, enum raw_event_type type) 
	s64			delta; /* ns */

	DEFINE_IR_RAW_EVENT(ev);

	int			rc = 0;

	int			delay;



	if (!dev->raw)

		return -EINVAL;



	now = ktime_get();

	delta = ktime_to_ns(ktime_sub(now, dev->raw->last_event));

	delay = MS_TO_NS(dev->input_dev->rep[REP_DELAY]);



	/* Check for a long duration since last event or if we're

	 * being called for the first time, note that delta can't

	 * possibly be negative.

	 */

	if (delta > IR_MAX_DURATION || !dev->raw->last_type)

	if (delta > delay || !dev->raw->last_type)

		type |= IR_START_EVENT;

	else

		ev.duration = delta;

drivers/media/rc/ite-cir.c

+9 −3
Original line number Diff line number Diff line
@@ -1347,6 +1347,7 @@ static const struct ite_dev_params ite_dev_descs[] = { 
	{	/* 0: ITE8704 */

	       .model = "ITE8704 CIR transceiver",

	       .io_region_size = IT87_IOREG_LENGTH,

	       .io_rsrc_no = 0,

	       .hw_tx_capable = true,

	       .sample_period = (u32) (1000000000ULL / 115200),

	       .tx_carrier_freq = 38000,
@@ -1371,6 +1372,7 @@ static const struct ite_dev_params ite_dev_descs[] = { 
	{	/* 1: ITE8713 */

	       .model = "ITE8713 CIR transceiver",

	       .io_region_size = IT87_IOREG_LENGTH,

	       .io_rsrc_no = 0,

	       .hw_tx_capable = true,

	       .sample_period = (u32) (1000000000ULL / 115200),

	       .tx_carrier_freq = 38000,
@@ -1395,6 +1397,7 @@ static const struct ite_dev_params ite_dev_descs[] = { 
	{	/* 2: ITE8708 */

	       .model = "ITE8708 CIR transceiver",

	       .io_region_size = IT8708_IOREG_LENGTH,

	       .io_rsrc_no = 0,

	       .hw_tx_capable = true,

	       .sample_period = (u32) (1000000000ULL / 115200),

	       .tx_carrier_freq = 38000,
@@ -1420,6 +1423,7 @@ static const struct ite_dev_params ite_dev_descs[] = { 
	{	/* 3: ITE8709 */

	       .model = "ITE8709 CIR transceiver",

	       .io_region_size = IT8709_IOREG_LENGTH,

	       .io_rsrc_no = 2,

	       .hw_tx_capable = true,

	       .sample_period = (u32) (1000000000ULL / 115200),

	       .tx_carrier_freq = 38000,
@@ -1461,6 +1465,7 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id 
	struct rc_dev *rdev = NULL;

	int ret = -ENOMEM;

	int model_no;

	int io_rsrc_no;



	ite_dbg("%s called", __func__);
@@ -1490,10 +1495,11 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id 


	/* get the description for the device */

	dev_desc = &ite_dev_descs[model_no];

	io_rsrc_no = dev_desc->io_rsrc_no;



	/* validate pnp resources */

	if (!pnp_port_valid(pdev, 0) ||

	    pnp_port_len(pdev, 0) != dev_desc->io_region_size) {

	if (!pnp_port_valid(pdev, io_rsrc_no) ||

	    pnp_port_len(pdev, io_rsrc_no) != dev_desc->io_region_size) {

		dev_err(&pdev->dev, "IR PNP Port not valid!\n");

		goto failure;

	}
@@ -1504,7 +1510,7 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id 
	}



	/* store resource values */

	itdev->cir_addr = pnp_port_start(pdev, 0);

	itdev->cir_addr = pnp_port_start(pdev, io_rsrc_no);

	itdev->cir_irq = pnp_irq(pdev, 0);



	/* initialize spinlocks */