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

Commit 18307839 authored by Rohit Vaswani's avatar Rohit Vaswani
Browse files

msm: fsm_bbif: Add error messages to ioctls 



Add meaningful error messages and fix break statements in
ioctl command.

Change-Id: Iaf193e6fc420eff48a90f67484a653450f892bc8
Acked-by: default avatarEdward Rodrigues <erodrigu@qti.qualcomm.com>
Signed-off-by: default avatarRohit Vaswani <rvaswani@codeaurora.org>
parent c77af294

arch/arm/mach-msm/bbif-fsm9900.c

+30 −12
Original line number Diff line number Diff line
@@ -208,51 +208,67 @@ static int bbif_release(struct inode *inode, struct file *file) 
static long bbif_ioctl(struct file *file,

	unsigned int cmd, unsigned long arg)

{

	unsigned int __user *argp = (unsigned int __user *) arg;

	void __iomem *argp = (void __iomem *) arg;

	void __iomem *bbif_adc_base;

	bbif_adc_base = bbif_base + BBIF_MISC;



	switch (cmd) {

	case BBIF_IOCTL_GET:

		{

			struct bbif_param param;



			if (copy_from_user(&param, argp, sizeof(param)))

			if (copy_from_user(&param, argp, sizeof(param))) {

				pr_err("%s: copy_from_user error\n", __func__);

				return -EFAULT;

			}



			if (param.offset > BBIF_MAX_OFFSET)

			if (param.offset > BBIF_MAX_OFFSET) {

				pr_err("%s: Exceeds max offset\n", __func__);

				return -EFAULT;

			}



			param.value = __raw_readl(bbif_base + param.offset);

			param.value = __raw_readl(bbif_adc_base + param.offset);



			if (copy_to_user(argp, &param, sizeof(param)))

			if (copy_to_user(argp, &param, sizeof(param))) {

				pr_err("%s: copy_to_user error\n", __func__);

				return -EFAULT;

			}

		}

		break;



	case BBIF_IOCTL_SET:

		{

			struct bbif_param param;



			if (copy_from_user(&param, argp, sizeof(param)))

			if (copy_from_user(&param, argp, sizeof(param))) {

				pr_err("%s: copy_from_user error\n", __func__);

				return -EFAULT;

			}



			if (param.offset > BBIF_MAX_OFFSET)

			if (param.offset > BBIF_MAX_OFFSET) {

				pr_err("%s: Exceeds max offset\n", __func__);

				return -EFAULT;

			}



			__raw_writel(param.value, bbif_base + param.offset);

			__raw_writel(param.value, bbif_adc_base +

					param.offset);

			mb();

		}

		break;



	case BBIF_IOCTL_SET_ADC_BW:

		{

			void __iomem *bbif_adc_base;

			struct bbif_bw_config param;



			bbif_adc_base = bbif_base + BBIF_MISC;

			if (copy_from_user(&param, argp, sizeof(param)))

			if (copy_from_user(&param, argp, sizeof(param))) {

				pr_err("%s: copy_from_user error\n", __func__);

				return -EFAULT;

			}



			if (param.adc_number > BBIF_MAX_ADC)

			if (param.adc_number > BBIF_MAX_ADC) {

				pr_err("%s: Exceeds max offset\n", __func__);

				return -EFAULT;

			}



			__raw_writel(param.bbrx_test1, bbif_adc_base +

				BBIF_BBRX_TEST1_BASE + param.adc_number*4);
@@ -263,8 +279,10 @@ static long bbif_ioctl(struct file *file, 
			__raw_writel(param.bbrx_config, bbif_adc_base +

				BBIF_BBRX_CONFIG_BASE + param.adc_number*4);

		}

		break;



	default:

		pr_err("%s: Invalid IOCTL\n", __func__);

		return -EINVAL;

	}