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

Commit 3f4cee40 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Fix 32-bit compilation issues"

parents 66cc9a62 adad3930

msm/vidc/msm_v4l2_private.c

+3 −3
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

// SPDX-License-Identifier: GPL-2.0-only

/*

/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 */

 */





#include "msm_v4l2_private.h"

#include "msm_v4l2_private.h"
@@ -9,7 +9,7 @@ static int convert_from_user(struct msm_vidc_arg *kp, unsigned long arg) 
{

{

	int rc = 0;

	int rc = 0;

	int i;

	int i;

	struct msm_vidc_arg __user *up = compat_ptr(arg);

	struct msm_vidc_arg __user *up = (struct msm_vidc_arg *)arg;





	if (!kp || !up) {

	if (!kp || !up) {

		d_vpr_e("%s: invalid params%pK %pK\n", __func__, kp, up);

		d_vpr_e("%s: invalid params%pK %pK\n", __func__, kp, up);
@@ -101,7 +101,7 @@ static int convert_to_user(struct msm_vidc_arg *kp, unsigned long arg) 
{

{

	int rc = 0;

	int rc = 0;

	int i;

	int i;

	struct msm_vidc_arg __user *up = compat_ptr(arg);

	struct msm_vidc_arg __user *up = (struct msm_vidc_arg *)arg;





	if (!kp || !up) {

	if (!kp || !up) {

		d_vpr_e("%s: invalid params %pK %pK\n",	__func__, kp, up);

		d_vpr_e("%s: invalid params %pK %pK\n",	__func__, kp, up);