On Wed, Oct 17, 2001 at 08:23:43PM -0700, Chip Salzenberg wrote:
> The recently advertised input-ps2 patch has a minor repeated bug, in
> that sprintf() calls are made without enough parameters. I'm not sure
> what the right fix is, but the attached patch at least calls sprintf()
> correctly.
> --
> Chip Salzenberg - a.k.a. - <chip@pobox.com>
> "We have no fuel on board, plus or minus 8 kilograms." -- NEAR tech
The correct lines should look like this:
sprintf(atkbd->phys, "%s/input0", serio->phys);
It's in the CVS, anyway.
>
> Index: drivers/char/atkbd.c
> --- drivers/char/atkbd.c.old Wed Oct 17 13:36:43 2001
> +++ drivers/char/atkbd.c Wed Oct 17 19:13:57 2001
> @@ -493,5 +493,5 @@
> sprintf(atkbd->name, "AT Set %d keyboard", atkbd->set);
>
> - sprintf(atkbd->phys, "%s/input0\n");
> + sprintf(atkbd->phys, "/dev/serio%d", serio->number);
>
> if (atkbd->set == 3)
>
> Index: drivers/char/psmouse.c
> --- drivers/char/psmouse.c.old Wed Oct 17 13:36:43 2001
> +++ drivers/char/psmouse.c Wed Oct 17 19:14:11 2001
> @@ -609,5 +609,5 @@
> sprintf(psmouse->devname, "%s %s %s",
> psmouse_protocols[psmouse->type], psmouse->vendor, psmouse->name);
> - sprintf(psmouse->phys, "%s/input0\n");
> + sprintf(psmouse->phys, "/dev/serio%d", serio->number);
>
> psmouse->dev.name = psmouse->devname;
>
> Index: drivers/char/xtkbd.c
> --- drivers/char/xtkbd.c.old Wed Oct 17 13:36:43 2001
> +++ drivers/char/xtkbd.c Wed Oct 17 19:14:07 2001
> @@ -115,5 +115,5 @@
> clear_bit(0, xtkbd->dev.keybit);
>
> - sprintf(xtkbd->phys, "%s/input0\n");
> + sprintf(xtkbd->phys, "/dev/serio%d", serio->number);
>
> xtkbd->dev.name = xtkbd_name;
-- Vojtech Pavlik SuSE Labs - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Tue Oct 23 2001 - 21:00:26 EST