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

Commit 3e857e63 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "radio: iris: Enable FM and add support for compat ioctls"

parents 5424d59c 62706d91

arch/arm64/configs/msm_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -474,6 +474,8 @@ CONFIG_MEDIA_USB_SUPPORT=y 
CONFIG_USB_VIDEO_CLASS=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_MSM_VIDC_V4L2=y

CONFIG_RADIO_IRIS=y

CONFIG_RADIO_IRIS_TRANSPORT=m

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_SOC=y

drivers/media/radio/radio-iris.c

+11 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved

/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -4209,10 +4209,17 @@ static int iris_vidioc_s_ctrl(struct file *file, void *priv, 
	case V4L2_CID_PRIVATE_IRIS_RIVA_POKE:

		if (radio->riva_data_req.cmd_params.length <=

		    MAX_RIVA_PEEK_RSP_SIZE) {

#ifdef CONFIG_COMPAT

			retval = copy_from_user(

					radio->riva_data_req.data,

					(void *)(__s64)ctrl->value,

					radio->riva_data_req.cmd_params.length);

#else

			retval = copy_from_user(

					radio->riva_data_req.data,

					(void *)ctrl->value,

					radio->riva_data_req.cmd_params.length);

#endif

			if (retval != 0) {

				retval = -retval;

				goto END;
@@ -5094,6 +5101,9 @@ static const struct v4l2_ioctl_ops iris_ioctl_ops = { 
static const struct v4l2_file_operations iris_fops = {

	.owner = THIS_MODULE,

	.unlocked_ioctl = video_ioctl2,

#ifdef CONFIG_COMPAT

	.compat_ioctl32 = v4l2_compat_ioctl32,

#endif

	.release        = iris_fops_release,

};