diff options
| author | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2007-01-25 14:44:06 +0000 |
|---|---|---|
| committer | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2007-01-25 14:44:06 +0000 |
| commit | 8462276d5289bc23efee4d532248dc79476b6133 (patch) | |
| tree | 093e536db46f0ad9c6ae18df3b86f1dabe4be8af | |
| parent | 8362c93efbfe70942118fe1b148dbaff68c3ceb8 (diff) | |
Code cleanup
| -rw-r--r-- | input/input-service.c | 4 | ||||
| -rw-r--r-- | input/input-service.h | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/input/input-service.c b/input/input-service.c index 8bbd7437..5f40ffdc 100644 --- a/input/input-service.c +++ b/input/input-service.c @@ -536,7 +536,7 @@ static int disconnect(struct input_device *idev, uint32_t flags) { struct hidp_conndel_req req; struct hidp_conninfo ci; - int ctl, err, ret = 0; + int ctl, err, ret = -1; ctl = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HIDP); if (ctl < 0) { @@ -558,7 +558,6 @@ static int disconnect(struct input_device *idev, uint32_t flags) } memset(&req, 0, sizeof(struct hidp_conndel_req)); - bacpy(&req.bdaddr, &idev->dba); req.flags = flags; if (ioctl(ctl, HIDPCONNDEL, &req) < 0) { @@ -1418,6 +1417,7 @@ void internal_service(const char *identifier) return; } + dbus_message_unref(msg); dbus_message_unref(reply); dbus_connection_flush(connection); diff --git a/input/input-service.h b/input/input-service.h index 179a02c5..6eefc6d4 100644 --- a/input/input-service.h +++ b/input/input-service.h @@ -21,12 +21,7 @@ * */ -#ifndef __INPUT_SERVICE_H -#define __INPUT_SERVICE_H - int input_dbus_init(void); void input_dbus_exit(void); void internal_service(const char *identifier); - -#endif /* __INPUT_SERVICE_H */ |