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

Commit 5a1938e1 authored by Venkata Manikumar Punyamanthula's avatar Venkata Manikumar Punyamanthula
Browse files

Merge commit '34e23080' into camera-kernel.lnx.4.0.r1-rel 



Change-Id: I3372a43e7954fa18bc1368d722ee1e3a0c2a9c68
Signed-off-by: default avatarVenkata Manikumar Punyamanthula <vpunya@codeaurora.org>
parents aa74199c 34e23080

drivers/cam_core/cam_context.c

+2 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ int cam_context_dump_pf_info(struct cam_context *ctx, 
		return -EINVAL;

	}



	mutex_lock(&ctx->ctx_mutex);

	if ((ctx->state > CAM_CTX_AVAILABLE) &&

		(ctx->state < CAM_CTX_STATE_MAX)) {

		if (ctx->state_machine[ctx->state].pagefault_ops) {
@@ -307,6 +308,7 @@ int cam_context_dump_pf_info(struct cam_context *ctx, 
				ctx->dev_hdl, ctx->state);

		}

	}

	mutex_unlock(&ctx->ctx_mutex);



	return rc;

}

drivers/cam_core/cam_node.h

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

/*

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

 * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.

 */



#ifndef _CAM_NODE_H_

drivers/cam_core/cam_subdev.c

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

/*

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

 * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.

 */



#include "cam_subdev.h"

drivers/cam_cust/cam_custom_dev.c

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

/*

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

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

 */



#include <linux/delay.h>

drivers/cam_fd/cam_fd_context.c

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

/*

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.

 */



#include <linux/module.h>