X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=input.c;h=2c34a7974fe69378edc2d32ee124271c929594aa;hb=515ac0b9d2c4d45a465335d54b8c49830914fcea;hp=dc8bedd3d5da8d0864b510f74d1f265fe5523ac0;hpb=c19e28f62660cdaed26698234cff9c084517b34c;p=libpicofe.git

diff --git a/input.c b/input.c
index dc8bedd..2c34a79 100644
--- a/input.c
+++ b/input.c
@@ -63,7 +63,7 @@ static int *in_alloc_binds(int drv_id, int key_count)
 			if (defbinds[i].bit == 0 && defbinds[i].btype == 0
 			    && defbinds[i].bit == 0)
 				break;
-			binds[IN_BIND_OFFS(defbinds[i].code, defbinds[i].btype)] =
+			binds[IN_BIND_OFFS(defbinds[i].code, defbinds[i].btype)] |=
 				1 << defbinds[i].bit;
 		}
 
@@ -808,7 +808,8 @@ int in_config_parse_dev(const char *name)
 	if (in_devices[i].name == NULL)
 		return -1;
 
-	in_devices[i].key_names = DRV(drv_id).get_key_names(&in_devices[i].key_count);
+	in_devices[i].key_names = DRV(drv_id).get_key_names(&DRV(drv_id),
+				&in_devices[i].key_count);
 	in_devices[i].drv_id = drv_id;
 
 	if (i + 1 > in_dev_count)