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

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

Merge "msm: camera: isp: variable should be accessed only if match is found"

parents 6cba1d68 441a08db

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/hw_utils/irq_controller/cam_irq_controller.c

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

/* Copyright (c) 2017-2020, 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
@@ -511,8 +511,8 @@ int cam_irq_controller_unsubscribe_irq(void *irq_controller, 
		}

	}



	priority = evt_handler->priority;

	if (found) {

		priority = evt_handler->priority;

		for (i = 0; i < controller->num_registers; i++) {

			irq_register = &controller->irq_register_arr[i];

			irq_register->top_half_enable_mask[priority] &=

drivers/media/platform/msm/camera_v3/cam_isp/isp_hw_mgr/hw_utils/irq_controller/cam_irq_controller.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2020, 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
@@ -511,8 +511,8 @@ int cam_irq_controller_unsubscribe_irq(void *irq_controller, 
		}

	}



	priority = evt_handler->priority;

	if (found) {

		priority = evt_handler->priority;

		for (i = 0; i < controller->num_registers; i++) {

			irq_register = &controller->irq_register_arr[i];

			irq_register->top_half_enable_mask[priority] &=