From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cyrus@holtmann.org>
From: Szymon Janc <szymon.janc@tieto.com>
To: linux-bluetooth@vger.kernel.org
Subject: Re: [PATCH v3] emulator/hciemu: Fix not handling failed read correctly
Date: Mon, 29 Sep 2014 10:27:37 +0200
Message-ID: <1560201.dnxDJYBh5A@uw000953>
In-Reply-To: <1411655558-18167-1-git-send-email-szymon.janc@tieto.com>
References: <1411655558-18167-1-git-send-email-szymon.janc@tieto.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Sender: linux-bluetooth-owner@vger.kernel.org
List-ID: <linux-bluetooth.vger.kernel.org>

On Thursday 25 of September 2014 16:32:38 Szymon Janc wrote:
> If read failed due to signal or blocking watch was removed resulting
> in closing /dev/vhci and emulated adapter being removed.
> 
> This was affecting android-tester since premature removal of adapter
> is considered error on android daemon.
> ---
>  emulator/hciemu.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/emulator/hciemu.c b/emulator/hciemu.c
> index 50285e4..fcaeb70 100644
> --- a/emulator/hciemu.c
> +++ b/emulator/hciemu.c
> @@ -179,6 +179,13 @@ static gboolean receive_btdev(GIOChannel *channel, GIOCondition condition,
>  	fd = g_io_channel_unix_get_fd(channel);
>  
>  	len = read(fd, buf, sizeof(buf));
> +	if (len < 0) {
> +		if (errno == EAGAIN || errno == EINTR)
> +			return TRUE;
> +
> +		return FALSE;
> +	}
> +
>  	if (len < 1)
>  		return FALSE;
>  
> 

Applied.

-- 
Best regards, 
Szymon Janc