From 89dacbb7d40fabeaf04f9e3f9d96eeb891f4da4b Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Fri, 24 Feb 2012 00:51:37 -0800 Subject: [PATCH] --- yaml --- r: 294011 b: refs/heads/master c: bd26f3d6fbb84f101f3e78f0591415d1c407976a h: refs/heads/master i: 294009: 33df2ddb86017b2fbc507e6c670b617e58f9c127 294007: 4ab01aea8105d0db9eda6f6fcdcdd82bc39e91b9 v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/psmouse-base.c | 15 ++++++++++----- trunk/drivers/input/mouse/psmouse.h | 2 ++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3cbdba6f4aaa..3bbdec7a3847 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 023cea0ecfa2df034096c3f4afa796a0b2d1188a +refs/heads/master: bd26f3d6fbb84f101f3e78f0591415d1c407976a diff --git a/trunk/drivers/input/mouse/psmouse-base.c b/trunk/drivers/input/mouse/psmouse-base.c index de7e8bc17b1f..ee91bd39bb08 100644 --- a/trunk/drivers/input/mouse/psmouse-base.c +++ b/trunk/drivers/input/mouse/psmouse-base.c @@ -1092,28 +1092,33 @@ static void psmouse_initialize(struct psmouse *psmouse) * psmouse_activate() enables the mouse so that we get motion reports from it. */ -static void psmouse_activate(struct psmouse *psmouse) +int psmouse_activate(struct psmouse *psmouse) { - if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE)) + if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE)) { psmouse_warn(psmouse, "Failed to enable mouse on %s\n", psmouse->ps2dev.serio->phys); + return -1; + } psmouse_set_state(psmouse, PSMOUSE_ACTIVATED); + return 0; } - /* * psmouse_deactivate() puts the mouse into poll mode so that we don't get motion * reports from it unless we explicitly request it. */ -static void psmouse_deactivate(struct psmouse *psmouse) +int psmouse_deactivate(struct psmouse *psmouse) { - if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_DISABLE)) + if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_DISABLE)) { psmouse_warn(psmouse, "Failed to deactivate mouse on %s\n", psmouse->ps2dev.serio->phys); + return -1; + } psmouse_set_state(psmouse, PSMOUSE_CMD_MODE); + return 0; } diff --git a/trunk/drivers/input/mouse/psmouse.h b/trunk/drivers/input/mouse/psmouse.h index 6a417092d010..fe1df231ba4c 100644 --- a/trunk/drivers/input/mouse/psmouse.h +++ b/trunk/drivers/input/mouse/psmouse.h @@ -105,6 +105,8 @@ int psmouse_reset(struct psmouse *psmouse); void psmouse_set_state(struct psmouse *psmouse, enum psmouse_state new_state); void psmouse_set_resolution(struct psmouse *psmouse, unsigned int resolution); psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse); +int psmouse_activate(struct psmouse *psmouse); +int psmouse_deactivate(struct psmouse *psmouse); struct psmouse_attribute { struct device_attribute dattr;