Linux bluetooth development
 help / color / mirror / Atom feed
From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 04/11] android/health: Fix missing error check
Date: Tue, 24 Jun 2014 15:11:55 +0300	[thread overview]
Message-ID: <1403611922-26901-4-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1403611922-26901-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>

From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>

---
 android/mcap-lib.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/android/mcap-lib.c b/android/mcap-lib.c
index 346688e..2a86416 100644
--- a/android/mcap-lib.c
+++ b/android/mcap-lib.c
@@ -2654,12 +2654,14 @@ static gboolean get_all_clocks(struct mcap_mcl *mcl, uint32_t *btclock,
 
 	while (latency > caps(mcl)->preempt_thresh && --retry >= 0) {
 
-		clock_gettime(CLK, &t0);
+		if (clock_gettime(CLK, &t0) < 0)
+			return FALSE;
 
 		if (!read_btclock(mcl, btclock, &btres))
 			continue;
 
-		clock_gettime(CLK, base_time);
+		if (clock_gettime(CLK, base_time) < 0)
+			return FALSE;
 
 		/*
 		 * Tries to detect preemption between clock_gettime
@@ -2668,6 +2670,9 @@ static gboolean get_all_clocks(struct mcap_mcl *mcl, uint32_t *btclock,
 		latency = time_us(base_time) - time_us(&t0);
 	}
 
+	if (retry < 0)
+		return FALSE;
+
 	*timestamp = mcap_get_timestamp(mcl, base_time);
 
 	return TRUE;
-- 
1.8.3.2


  parent reply	other threads:[~2014-06-24 12:11 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-24 12:11 [PATCH 01/11] android/hal-health: trivial: Correct coding style Andrei Emeltchenko
2014-06-24 12:11 ` [PATCH 02/11] android/health: Remove unneeded check Andrei Emeltchenko
2014-06-24 12:11 ` [PATCH 03/11] android/health: Fix possible overflow Andrei Emeltchenko
2014-06-24 12:11 ` Andrei Emeltchenko [this message]
2014-06-24 12:11 ` [PATCH 05/11] android/health: trivial: Remove empty line Andrei Emeltchenko
2014-06-24 12:11 ` [PATCH 06/11] android/health: Remove extra check Andrei Emeltchenko
2014-06-24 12:11 ` [PATCH 07/11] android/health: trivial: Fix missing space Andrei Emeltchenko
2014-06-24 12:11 ` [PATCH 08/11] android/health: Refactor setting mcl callbacks to function Andrei Emeltchenko
2014-06-24 12:12 ` [PATCH 09/11] android/health: Add actual error message to error print Andrei Emeltchenko
2014-06-24 12:12 ` [PATCH 10/11] android/health: Refactor create_device Andrei Emeltchenko
2014-06-24 12:12 ` [PATCH 11/11] android/health: Add setting mcl callbacks for incoming connection Andrei Emeltchenko
2014-06-25 15:30 ` [PATCH 01/11] android/hal-health: trivial: Correct coding style Szymon Janc

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1403611922-26901-4-git-send-email-Andrei.Emeltchenko.news@gmail.com \
    --to=andrei.emeltchenko.news@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox