android/hidhost: Cleanup handle_uhid_output

This commit is contained in:
Szymon Janc 2014-04-18 15:40:04 +02:00
parent 4a0ac907ca
commit 35cd7eddbf

View File

@ -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,