Merge "diag: Update missing upd mapping parameter"

	return 0;

}

long diagchar_ioctl_init(struct file *filp,

static long diagchar_ioctl_init(struct file *filp,

			   unsigned int iocmd, unsigned long ioarg)

{

	int result = -EINVAL;

	return result;

}

long diagchar_ioctl_dci(struct file *filp,

static long diagchar_ioctl_dci(struct file *filp,

			   unsigned int iocmd, unsigned long ioarg)

{

	int result = -EINVAL, client_id = 0;

	return result;

}

long diagchar_ioctl_buffering(struct file *filp,

static long diagchar_ioctl_buffering(struct file *filp,

			   unsigned int iocmd, unsigned long ioarg)

{

	int result = -EINVAL;

	return result;

}

long diagchar_ioctl_remote(struct file *filp,

static long diagchar_ioctl_remote(struct file *filp,

			   unsigned int iocmd, unsigned long ioarg)

{

	int result = -EINVAL;

	return result;

}

long diagchar_ioctl_misc(struct file *filp,

static long diagchar_ioctl_misc(struct file *filp,

			   unsigned int iocmd, unsigned long ioarg)

{

	int result = -EINVAL;

	return result;

}

long diagchar_ioctl_mdlog(struct file *filp,

static long diagchar_ioctl_mdlog(struct file *filp,

			   unsigned int iocmd, unsigned long ioarg)

{

	int result = -EINVAL;

	case DIAG_IOCTL_QUERY_CON_ALL:

		con_param.diag_con_all = DIAG_CON_ALL;

		con_param.num_peripherals = NUM_PERIPHERALS;

		con_param.upd_map_supported = 1;

		if (copy_to_user((void __user *)ioarg, &con_param,

				sizeof(struct diag_con_all_param_t)))

			result = -EFAULT;