diff options
author | Szymon Janc <szymon.janc@tieto.com> | 2014-04-18 15:40:04 +0200 |
---|---|---|
committer | Szymon Janc <szymon.janc@tieto.com> | 2014-04-23 10:03:36 +0200 |
commit | 35cd7eddbfa397dbd34986e50155320834d842a7 (patch) | |
tree | 963a77c8455d3a26072648d293cf7eebe2a1b073 /android/hidhost.c | |
parent | 4a0ac907cabd40ebed3ec2160a0f27826b74783e (diff) | |
download | bluez-35cd7eddbfa397dbd34986e50155320834d842a7.tar.gz |
android/hidhost: Cleanup handle_uhid_output
Diffstat (limited to 'android/hidhost.c')
-rw-r--r-- | android/hidhost.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/android/hidhost.c b/android/hidhost.c index b8d2d8f84..ea8373302 100644 --- a/android/hidhost.c +++ b/android/hidhost.c @@ -173,15 +173,14 @@ static void hex2buf(const uint8_t *hex, uint8_t *buf, int num) static void handle_uhid_output(struct hid_device *dev, struct uhid_output_req *output) { - int fd; - uint8_t *req = NULL; - uint8_t req_size = 0; + int fd, req_size; + uint8_t *req; - if (!(dev->ctrl_io)) + if (!dev->ctrl_io) return; req_size = 1 + output->size; - req = g_try_malloc0(req_size); + req = malloc0(req_size); if (!req) return; @@ -191,10 +190,10 @@ static void handle_uhid_output(struct hid_device *dev, fd = g_io_channel_unix_get_fd(dev->ctrl_io); if (write(fd, req, req_size) < 0) - error("error writing set_report: %s (%d)", - strerror(errno), errno); + error("hidhost: error writing set_report: %s (%d)", + strerror(errno), errno); - g_free(req); + free(req); } static gboolean uhid_event_cb(GIOChannel *io, GIOCondition cond, |