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

Commit 17f5f28f authored by Lee Jones's avatar Lee Jones Committed by Jassi Brar
Browse files

mailbox: mailbox-test: Use more consistent format for calling copy_from_user() 



While we're at it, ensure copy-to location is NULL'ed in the error path.

Suggested-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarJassi Brar <jaswinder.singh@linaro.org>
parent a61b37ea

drivers/mailbox/mailbox-test.c

+3 −4
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ static ssize_t mbox_test_signal_write(struct file *filp, 
				       size_t count, loff_t *ppos)

{

	struct mbox_test_device *tdev = filp->private_data;

	int ret;



	if (!tdev->tx_channel) {

		dev_err(tdev->dev, "Channel cannot do Tx\n");
@@ -64,13 +63,13 @@ static ssize_t mbox_test_signal_write(struct file *filp, 
	if (!tdev->signal)

		return -ENOMEM;



	ret = copy_from_user(tdev->signal, userbuf, count);

	if (ret) {

	if (copy_from_user(tdev->signal, userbuf, count)) {

		kfree(tdev->signal);

		tdev->signal = NULL;

		return -EFAULT;

	}



	return ret < 0 ? ret : count;

	return count;

}



static const struct file_operations mbox_test_signal_ops = {