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

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

Merge "msm: arm64: fix compiler warnings due to improper braces or indentation"

parents 5c544a48 d97e82ee

drivers/crypto/msm/qce50.c

+2 −2
Original line number Diff line number Diff line 
/*

 * QTI Crypto Engine driver.

 *

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

 * Copyright (c) 2012-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
@@ -4680,7 +4680,7 @@ static int select_mode(struct qce_device *pce_dev, 
			pce_dev->intr_cadence = 0;

			atomic_set(&pce_dev->bunch_cmd_seq, 0);

			atomic_set(&pce_dev->last_intr_seq, 0);

			pce_dev->cadence_flag = ~pce_dev->cadence_flag;

			pce_dev->cadence_flag = !pce_dev->cadence_flag;

		}

	}

drivers/crypto/msm/qcedev.c

+4 −2
Original line number Diff line number Diff line
@@ -1808,10 +1808,11 @@ static inline long qcedev_ioctl(struct file *file, 
				handle->sha_ctxt.diglen);

		mutex_unlock(&hash_access_lock);

		if (copy_to_user((void __user *)arg, &qcedev_areq->sha_op_req,

					sizeof(struct qcedev_sha_op_req)))

					sizeof(struct qcedev_sha_op_req))) {

			err = -EFAULT;

			goto exit_free_qcedev_areq;

		}

		}

		break;



	case QCEDEV_IOCTL_SHA_FINAL_REQ:
@@ -1900,10 +1901,11 @@ static inline long qcedev_ioctl(struct file *file, 
				handle->sha_ctxt.diglen);

		mutex_unlock(&hash_access_lock);

		if (copy_to_user((void __user *)arg, &qcedev_areq->sha_op_req,

					sizeof(struct qcedev_sha_op_req)))

					sizeof(struct qcedev_sha_op_req))) {

			err = -EFAULT;

			goto exit_free_qcedev_areq;

		}

		}

		break;



	case QCEDEV_IOCTL_MAP_BUF_REQ:

drivers/platform/msm/ipa/ipa_clients/ipa_uc_offload.c

+2 −1
Original line number Diff line number Diff line
@@ -673,6 +673,7 @@ static int ipa_uc_ntn_disconn_pipes(struct ipa_uc_offload_ctx *ntn_ctx) 
	}

	if (ntn_ctx->conn.dl.smmu_enabled)

		ipa_uc_ntn_free_conn_smmu_info(&ntn_ctx->conn.dl);



	ipa_uc_ntn_free_conn_smmu_info(&ntn_ctx->conn.ul);



	return ret;

fs/ext4/page-io.c

+17 −16
Original line number Diff line number Diff line
@@ -479,13 +479,13 @@ int ext4_bio_write_page(struct ext4_io_submit *io, 
		if (io->io_bio)

			gfp_flags = GFP_NOWAIT | __GFP_NOWARN;

	retry_encrypt:

	if (!fscrypt_using_hardware_encryption(inode))

		data_page = fscrypt_encrypt_page(inode, page, PAGE_SIZE, 0,

						page->index, gfp_flags);

		if (!fscrypt_using_hardware_encryption(inode)) {

			data_page = fscrypt_encrypt_page(inode, page,

				 PAGE_SIZE, 0, page->index, gfp_flags);

			if (IS_ERR(data_page)) {

				ret = PTR_ERR(data_page);

			if (ret == -ENOMEM &&

			    (io->io_bio || wbc->sync_mode == WB_SYNC_ALL)) {

				if (ret == -ENOMEM && (io->io_bio ||

					wbc->sync_mode == WB_SYNC_ALL)) {

					gfp_flags = GFP_NOFS;

					if (io->io_bio)

						ext4_io_submit(io);
@@ -498,6 +498,7 @@ int ext4_bio_write_page(struct ext4_io_submit *io, 
				goto out;

			}

		}

	}



	/* Now submit buffers to write */

	do {