diff options
| author | cbdev <cb@cbcdn.com> | 2020-03-08 17:12:03 +0100 |
|---|---|---|
| committer | cbdev <cb@cbcdn.com> | 2020-03-08 17:12:03 +0100 |
| commit | e0000797c80789d9d4559bb5264b982c187e1137 (patch) | |
| tree | 746a063886aa0a3e51a21ce83bc8e2189d6adcd9 /backends/evdev.c | |
| parent | 8558c3acef273833d7366e1af3659514fff9c942 (diff) | |
| parent | 5f4b349aff49be0a5f6895631a93c47fcafcff93 (diff) | |
| download | midimonster-e0000797c80789d9d4559bb5264b982c187e1137.tar.gz midimonster-e0000797c80789d9d4559bb5264b982c187e1137.tar.bz2 midimonster-e0000797c80789d9d4559bb5264b982c187e1137.zip | |
Merge branch 'master' into debian/master
Diffstat (limited to 'backends/evdev.c')
| -rw-r--r-- | backends/evdev.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/backends/evdev.c b/backends/evdev.c index 4725ef7..af5ec74 100644 --- a/backends/evdev.c +++ b/backends/evdev.c @@ -63,16 +63,11 @@ static int evdev_configure(char* option, char* value) { return 1; } -static instance* evdev_instance(){ - instance* inst = mm_instance(); - if(!inst){ - return NULL; - } - +static int evdev_instance(instance* inst){ evdev_instance_data* data = calloc(1, sizeof(evdev_instance_data)); if(!data){ LOG("Failed to allocate memory"); - return NULL; + return 1; } data->input_fd = -1; @@ -81,12 +76,12 @@ static instance* evdev_instance(){ if(!data->output_proto){ LOG("Failed to initialize libevdev output prototype device"); free(data); - return NULL; + return 1; } #endif inst->impl = data; - return inst; + return 0; } static int evdev_attach(instance* inst, evdev_instance_data* data, char* node){ |