summaryrefslogtreecommitdiffstats
path: root/drivers/platform/goldfish
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2016-01-06 14:05:55 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-01-28 23:34:36 -0800
commit25dd0f407307c54de5025250ca1dfbd4bdbb2fba (patch)
tree4e7c832bcb3cb3e135d1f8e2262f4797fd32050f /drivers/platform/goldfish
parent91a18a414185a2b937e2cc8bf0cc32de1863d11a (diff)
downloadlinux-25dd0f407307c54de5025250ca1dfbd4bdbb2fba.tar.gz
linux-25dd0f407307c54de5025250ca1dfbd4bdbb2fba.tar.bz2
linux-25dd0f407307c54de5025250ca1dfbd4bdbb2fba.zip
platform: goldfish: pipe: don't log when dropping PIPE_ERROR_AGAIN
On PIPE_ERROR_AGAIN, just stopping in the middle of a transfer and returning the number of bytes actually handled is the right behavior. Other errors should be returned on the next read() or write() call. Continue logging those until we confirm nothing actually relies on the existing (wrong) behavior of dropping errors on the floor. Signed-off-by: Greg Hackmann <ghackmann@google.com> Signed-off-by: Jin Qian <jinqian@android.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/platform/goldfish')
-rw-r--r--drivers/platform/goldfish/goldfish_pipe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index 0b187ff7a35b..7a56be9c9432 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -346,7 +346,8 @@ static ssize_t goldfish_pipe_read_write(struct file *filp, char __user *buffer,
* cannot change it until we check if any user space
* ABI relies on this behavior.
*/
- pr_info_ratelimited("android_pipe: backend returned error %d on %s\n",
+ if (status != PIPE_ERROR_AGAIN)
+ pr_info_ratelimited("goldfish_pipe: backend returned error %d on %s\n",
status, is_write ? "write" : "read");
ret = 0;
break;