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

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

Merge "msm: sensor: Copy camera power down settings correctly"

parents 0d0a30dc 0b838e4e

drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c

+10 −9
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2019, 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
@@ -577,11 +577,12 @@ static int32_t msm_sensor_get_power_down_settings(void *setting, 
				kfree(pd);

				return -EFAULT;

			}

		}

		} else

#endif

		if (copy_from_user(

			pd, (void __user *)slave_info->power_setting_array

			.power_down_setting, sizeof(*pd) * size_down)) {

			if (copy_from_user(pd,

				(void __user *)slave_info->power_setting_array

				.power_down_setting,

				sizeof(*pd) * size_down)) {

				pr_err("failed: copy_from_user");

				kfree(pd);

				return -EFAULT;