| From a9298ee5d4e15530c679de8315bd39880b822afa Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 3 Jun 2021 13:28:12 +0100 |
| Subject: fsi: core: Fix return of error values on failures |
| |
| From: Colin Ian King <colin.king@canonical.com> |
| |
| [ Upstream commit 910810945707fe9877ca86a0dca4e585fd05e37b ] |
| |
| Currently the cfam_read and cfam_write functions return the provided |
| number of bytes given in the count parameter and not the error return |
| code in variable rc, hence all failures of read/writes are being |
| silently ignored. Fix this by returning the error code in rc. |
| |
| Addresses-Coverity: ("Unused value") |
| Fixes: d1dcd6782576 ("fsi: Add cfam char devices") |
| Signed-off-by: Colin Ian King <colin.king@canonical.com> |
| Reviewed-by: Jeremy Kerr <jk@ozlabs.org> |
| Link: https://lore.kernel.org/r/20210603122812.83587-1-colin.king@canonical.com |
| Signed-off-by: Joel Stanley <joel@jms.id.au> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/fsi/fsi-core.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c |
| index 4e60e84cd17a..59ddc9fd5bca 100644 |
| --- a/drivers/fsi/fsi-core.c |
| +++ b/drivers/fsi/fsi-core.c |
| @@ -724,7 +724,7 @@ static ssize_t cfam_read(struct file *filep, char __user *buf, size_t count, |
| rc = count; |
| fail: |
| *offset = off; |
| - return count; |
| + return rc; |
| } |
| |
| static ssize_t cfam_write(struct file *filep, const char __user *buf, |
| @@ -761,7 +761,7 @@ static ssize_t cfam_write(struct file *filep, const char __user *buf, |
| rc = count; |
| fail: |
| *offset = off; |
| - return count; |
| + return rc; |
| } |
| |
| static loff_t cfam_llseek(struct file *file, loff_t offset, int whence) |
| -- |
| 2.30.2 |
| |