diff --git a/[refs] b/[refs] index 23e30dc880b0..4318a12dd074 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 843e784afe164ac8c75a97259d54cf489be74bb9 +refs/heads/master: 8c31eb01e1ab91df69c60554b9aec2d522d414e0 diff --git a/trunk/drivers/input/serio/serio_raw.c b/trunk/drivers/input/serio/serio_raw.c index 77ce3a6a1599..a5afc7cbcdfc 100644 --- a/trunk/drivers/input/serio/serio_raw.c +++ b/trunk/drivers/input/serio/serio_raw.c @@ -139,9 +139,9 @@ static int serio_raw_release(struct inode *inode, struct file *file) return 0; } -static int serio_raw_fetch_byte(struct serio_raw *serio_raw, char *c) +static bool serio_raw_fetch_byte(struct serio_raw *serio_raw, char *c) { - int empty; + bool empty; serio_pause_rx(serio_raw->serio); @@ -394,7 +394,7 @@ static struct serio_driver serio_raw_drv = { .connect = serio_raw_connect, .reconnect = serio_raw_reconnect, .disconnect = serio_raw_disconnect, - .manual_bind = 1, + .manual_bind = true, }; static int __init serio_raw_init(void)