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

Commit 2c487bbb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  V4L/DVB (11680): cafe_ccic: use = instead of == for setting a value at a var
  V4L/DVB (11679): cafe_ccic: fix sensor detection
  V4L/DVB (11675): ivtv/radio: fix V4L2_TUNER_MODE/V4L2_TUNER_SUB confusion
  V4L/DVB (11674): ivtv: fix incorrect bit tests
  V4L/DVB (11669): uvc: fix compile warning
  V4L/DVB (11668): ivtv: fix compiler warning.
  V4L/DVB (11664): cx23885: Frontend wasn't locking on HVR-1500
  V4L/DVB (11662): v4l2-ioctl: Clear buffer type specific trailing fields/padding
  V4L/DVB (11661): v4l2-ioctl: Check buffer types using g_fmt instead of try_fmt
  V4L/DVB (11660): zoran: fix bug when enumerating format -1
  V4L/DVB (11575): uvcvideo: fix uvc resume failed
parents 2ad20802 90c69f29

drivers/media/radio/radio-sf16fmi.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, 
	mult = (fmi->flags & V4L2_TUNER_CAP_LOW) ? 1 : 1000;

	v->rangelow = RSF16_MINFREQ / mult;

	v->rangehigh = RSF16_MAXFREQ / mult;

	v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_MODE_STEREO;

	v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;

	v->capability = fmi->flags & V4L2_TUNER_CAP_LOW;

	v->audmode = V4L2_TUNER_MODE_STEREO;

	v->signal = fmi_getsigstr(fmi);

drivers/media/radio/radio-sf16fmr2.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, 
	mult = (fmr2->flags & V4L2_TUNER_CAP_LOW) ? 1 : 1000;

	v->rangelow = RSF16_MINFREQ / mult;

	v->rangehigh = RSF16_MAXFREQ / mult;

	v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_MODE_STEREO;

	v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;

	v->capability = fmr2->flags&V4L2_TUNER_CAP_LOW;

	v->audmode = fmr2->stereo ? V4L2_TUNER_MODE_STEREO:

				V4L2_TUNER_MODE_MONO;

drivers/media/video/cafe_ccic.c

+1 −0
Original line number Diff line number Diff line
@@ -774,6 +774,7 @@ static int cafe_cam_init(struct cafe_camera *cam) 
	ret = __cafe_cam_reset(cam);

	if (ret)

		goto out;

	chip.ident = V4L2_IDENT_NONE;

	chip.match.type = V4L2_CHIP_MATCH_I2C_ADDR;

	chip.match.addr = cam->sensor_addr;

	ret = sensor_call(cam, core, g_chip_ident, &chip);

drivers/media/video/cx23885/cx23885-dvb.c

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ static int dvb_register(struct cx23885_tsport *port) 
			static struct xc2028_ctrl ctl = {

				.fname       = XC2028_DEFAULT_FIRMWARE,

				.max_len     = 64,

				.scode_table = XC3028_FE_OREN538,

				.demod       = XC3028_FE_OREN538,

			};



			fe = dvb_attach(xc2028_attach,

drivers/media/video/ivtv/ivtv-driver.c

+6 −3
Original line number Diff line number Diff line
@@ -305,14 +305,17 @@ int ivtv_waitq(wait_queue_head_t *waitq) 
/* Generic utility functions */

int ivtv_msleep_timeout(unsigned int msecs, int intr)

{

	int ret;

	int timeout = msecs_to_jiffies(msecs);



	do {

		set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);

		timeout = schedule_timeout(timeout);

		if (intr && (ret = signal_pending(current)))

		if (intr) {

			int ret = signal_pending(current);



			if (ret)

				return ret;

		}

	} while (timeout);

	return 0;

}