git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
input
/
mouse
/
sermouse.c
diff --git
a/drivers/input/mouse/sermouse.c
b/drivers/input/mouse/sermouse.c
index
2f9a04a
..
a85d747
100644
(file)
--- a/
drivers/input/mouse/sermouse.c
+++ b/
drivers/input/mouse/sermouse.c
@@
-33,7
+33,6
@@
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/input.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/input.h>
-#include <linux/config.h>
#include <linux/serio.h>
#include <linux/init.h>
#include <linux/serio.h>
#include <linux/init.h>
@@
-43,7
+42,7
@@
MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
-static char *sermouse_protocols[] = { "None", "Mouse Systems Mouse", "Sun Mouse", "Microsoft Mouse",
+static c
onst c
har *sermouse_protocols[] = { "None", "Mouse Systems Mouse", "Sun Mouse", "Microsoft Mouse",
"Logitech M+ Mouse", "Microsoft MZ Mouse", "Logitech MZ+ Mouse",
"Logitech MZ++ Mouse"};
"Logitech M+ Mouse", "Microsoft MZ Mouse", "Logitech MZ+ Mouse",
"Logitech MZ++ Mouse"};
@@
-62,13
+61,11
@@
struct sermouse {
* second, which is as good as a PS/2 or USB mouse.
*/
* second, which is as good as a PS/2 or USB mouse.
*/
-static void sermouse_process_msc(struct sermouse *sermouse, signed char data
, struct pt_regs *regs
)
+static void sermouse_process_msc(struct sermouse *sermouse, signed char data)
{
struct input_dev *dev = sermouse->dev;
signed char *buf = sermouse->buf;
{
struct input_dev *dev = sermouse->dev;
signed char *buf = sermouse->buf;
- input_regs(dev, regs);
-
switch (sermouse->count) {
case 0:
switch (sermouse->count) {
case 0:
@@
-105,15
+102,13
@@
static void sermouse_process_msc(struct sermouse *sermouse, signed char data, st
* standard 3-byte packets and 1200 bps.
*/
* standard 3-byte packets and 1200 bps.
*/
-static void sermouse_process_ms(struct sermouse *sermouse, signed char data
, struct pt_regs *regs
)
+static void sermouse_process_ms(struct sermouse *sermouse, signed char data)
{
struct input_dev *dev = sermouse->dev;
signed char *buf = sermouse->buf;
if (data & 0x40) sermouse->count = 0;
{
struct input_dev *dev = sermouse->dev;
signed char *buf = sermouse->buf;
if (data & 0x40) sermouse->count = 0;
- input_regs(dev, regs);
-
switch (sermouse->count) {
case 0:
switch (sermouse->count) {
case 0:
@@
-207,7
+202,7
@@
static void sermouse_process_ms(struct sermouse *sermouse, signed char data, str
*/
static irqreturn_t sermouse_interrupt(struct serio *serio,
*/
static irqreturn_t sermouse_interrupt(struct serio *serio,
- unsigned char data, unsigned int flags
, struct pt_regs *regs
)
+ unsigned char data, unsigned int flags)
{
struct sermouse *sermouse = serio_get_drvdata(serio);
{
struct sermouse *sermouse = serio_get_drvdata(serio);
@@
-215,9
+210,9
@@
static irqreturn_t sermouse_interrupt(struct serio *serio,
sermouse->last = jiffies;
if (sermouse->type > SERIO_SUN)
sermouse->last = jiffies;
if (sermouse->type > SERIO_SUN)
- sermouse_process_ms(sermouse, data
, regs
);
+ sermouse_process_ms(sermouse, data);
else
else
- sermouse_process_msc(sermouse, data
, regs
);
+ sermouse_process_msc(sermouse, data);
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
@@
-251,10
+246,10
@@
static int sermouse_connect(struct serio *serio, struct serio_driver *drv)
sermouse = kzalloc(sizeof(struct sermouse), GFP_KERNEL);
input_dev = input_allocate_device();
if (!sermouse || !input_dev)
sermouse = kzalloc(sizeof(struct sermouse), GFP_KERNEL);
input_dev = input_allocate_device();
if (!sermouse || !input_dev)
- goto fail;
+ goto fail
1
;
sermouse->dev = input_dev;
sermouse->dev = input_dev;
- s
printf(sermouse->phys
, "%s/input0", serio->phys);
+ s
nprintf(sermouse->phys, sizeof(sermouse->phys)
, "%s/input0", serio->phys);
sermouse->type = serio->id.proto;
input_dev->name = sermouse_protocols[sermouse->type];
sermouse->type = serio->id.proto;
input_dev->name = sermouse_protocols[sermouse->type];
@@
-280,14
+275,17
@@
static int sermouse_connect(struct serio *serio, struct serio_driver *drv)
err = serio_open(serio, drv);
if (err)
err = serio_open(serio, drv);
if (err)
- goto fail;
+ goto fail
2
;
- input_register_device(sermouse->dev);
+ err = input_register_device(sermouse->dev);
+ if (err)
+ goto fail3;
return 0;
return 0;
- fail: serio_set_drvdata(serio, NULL);
- input_free_device(input_dev);
+ fail3: serio_close(serio);
+ fail2: serio_set_drvdata(serio, NULL);
+ fail1: input_free_device(input_dev);
kfree(sermouse);
return err;
}
kfree(sermouse);
return err;
}
@@
-353,8
+351,7
@@
static struct serio_driver sermouse_drv = {
static int __init sermouse_init(void)
{
static int __init sermouse_init(void)
{
- serio_register_driver(&sermouse_drv);
- return 0;
+ return serio_register_driver(&sermouse_drv);
}
static void __exit sermouse_exit(void)
}
static void __exit sermouse_exit(void)