On Sun, 2014-06-01 at 14:55 +0300, Tanu Kaskinen wrote: > The code in the "io_fail" section was only used for HUP handling, but > there were jumps to there also from places where reading or writing > failed, because the read/write failure could have been caused by HUP. > This patch simplifies things by checking for HUP condition before > trying to read or write. Now if reading or writing fails, we will > jump to "fail" directly instead of going via the "io_fail" label. As > a result, the "io_fail" label isn't needed any more. > --- > src/modules/bluetooth/module-bluez5-device.c | 48 ++++++++++++---------------- > 1 file changed, 20 insertions(+), 28 deletions(-) I applied this now. -- Tanu