diff options
author | Ravi kumar Veeramally <ravikumar.veeramally@linux.intel.com> | 2014-01-23 15:39:26 +0200 |
---|---|---|
committer | Szymon Janc <szymon.janc@tieto.com> | 2014-01-28 16:17:07 +0100 |
commit | 696372263db9bd3cbd446fc58e90a21a4eb737d7 (patch) | |
tree | c284f17caabedc309fa770be8c008f54dca7cb0d /android/pan.c | |
parent | 1c23302203431b65ab897e64a31a1bfe799836df (diff) | |
download | bluez-696372263db9bd3cbd446fc58e90a21a4eb737d7.tar.gz |
android/pan: Handle error case properly in NAP registration
Diffstat (limited to 'android/pan.c')
-rw-r--r-- | android/pan.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/android/pan.c b/android/pan.c index 6670c5161..2bc54bda7 100644 --- a/android/pan.c +++ b/android/pan.c @@ -471,8 +471,14 @@ static int set_forward_delay(void) int fd, ret; fd = open(FORWARD_DELAY_PATH, O_RDWR); - if (fd < 0) - return -errno; + if (fd < 0) { + int err = -errno; + + error("pan: open forward delay file failed: %d (%s)", + -err, strerror(-err)); + + return err; + } ret = write(fd, "0", sizeof("0")); close(fd); @@ -728,7 +734,7 @@ bool bt_pan_register(const bdaddr_t *addr) } err = bnep_init(); - if (err) { + if (err < 0) { error("bnep init failed"); bt_adapter_remove_record(rec->handle); return false; @@ -736,6 +742,7 @@ bool bt_pan_register(const bdaddr_t *addr) err = register_nap_server(); if (err < 0) { + error("Failed to register NAP"); bt_adapter_remove_record(rec->handle); bnep_cleanup(); return false; |