From e7d785302d2507081c7c01c2a8065bcfbd9019b5 Mon Sep 17 00:00:00 2001 From: Pavlin Radoslavov Date: Wed, 18 May 2016 15:22:55 -0700 Subject: [PATCH] Add a missing OSI_NO_INTR() wrapper around socket read() Also, print a better error message. Change-Id: I22da05fd5e9b10a5122705105ea7a45855eb144d (cherry picked from commit a5c0f1596095ec9017bb50c035f327f708a5d8e8) --- vendor_libs/linux/bt_vendor_linux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vendor_libs/linux/bt_vendor_linux.c b/vendor_libs/linux/bt_vendor_linux.c index eec3e01ba..41abc8a93 100644 --- a/vendor_libs/linux/bt_vendor_linux.c +++ b/vendor_libs/linux/bt_vendor_linux.c @@ -202,10 +202,10 @@ static int bt_vendor_wait_hcidev(void) } if (fds[0].revents & POLLIN) { - n = read(fd, &ev, sizeof(struct mgmt_pkt)); + OSI_NO_INTR(n = read(fd, &ev, sizeof(struct mgmt_pkt))); if (n < 0) { - LOG_ERROR(LOG_TAG, - "Error reading control channel"); + LOG_ERROR(LOG_TAG, "Error reading control channel: %s", + strerror(errno)); ret = -1; break; } -- 2.11.0