diff options
| author | Lee Jones <lee.jones@linaro.org> | 2016-03-23 15:43:41 +0100 |
|---|---|---|
| committer | Jassi Brar <jaswinder.singh@linaro.org> | 2016-04-12 09:58:20 +0200 |
| commit | 17f5f28ffa6e81461a569290ae802a9b05a89072 (patch) | |
| tree | d13894a7a30fc57b2681661d980845ab20b08e31 /drivers/mailbox/mailbox-test.c | |
| parent | mailbox: xgene-slimpro: Fix wrong test for devm_kzalloc (diff) | |
| download | linux-17f5f28ffa6e81461a569290ae802a9b05a89072.tar.xz linux-17f5f28ffa6e81461a569290ae802a9b05a89072.zip | |
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: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/mailbox/mailbox-test.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/mailbox/mailbox-test.c b/drivers/mailbox/mailbox-test.c index dc11bbf27274..5f4b439fd45a 100644 --- a/drivers/mailbox/mailbox-test.c +++ b/drivers/mailbox/mailbox-test.c @@ -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 = { |