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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
input
/
mouse
/
synaptics.c
diff --git
a/drivers/input/mouse/synaptics.c
b/drivers/input/mouse/synaptics.c
index
ad5d0a8
..
2051bec
100644
(file)
--- a/
drivers/input/mouse/synaptics.c
+++ b/
drivers/input/mouse/synaptics.c
@@
-247,12
+247,14
@@
static void synaptics_pt_create(struct psmouse *psmouse)
{
struct serio *serio;
{
struct serio *serio;
- serio = k
z
alloc(sizeof(struct serio), GFP_KERNEL);
+ serio = k
m
alloc(sizeof(struct serio), GFP_KERNEL);
if (!serio) {
printk(KERN_ERR "synaptics: not enough memory to allocate pass-through port\n");
return;
}
if (!serio) {
printk(KERN_ERR "synaptics: not enough memory to allocate pass-through port\n");
return;
}
+ memset(serio, 0, sizeof(struct serio));
+
serio->id.type = SERIO_PS_PSTHRU;
strlcpy(serio->name, "Synaptics pass-through", sizeof(serio->name));
strlcpy(serio->phys, "synaptics-pt/serio0", sizeof(serio->name));
serio->id.type = SERIO_PS_PSTHRU;
strlcpy(serio->name, "Synaptics pass-through", sizeof(serio->name));
strlcpy(serio->phys, "synaptics-pt/serio0", sizeof(serio->name));
@@
-603,21
+605,14
@@
static struct dmi_system_id toshiba_dmi_table[] = {
.ident = "Toshiba Satellite",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
.ident = "Toshiba Satellite",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Satellite"),
+ DMI_MATCH(DMI_PRODUCT_NAME
, "Satellite"),
},
},
{
.ident = "Toshiba Dynabook",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
},
},
{
.ident = "Toshiba Dynabook",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
- DMI_MATCH(DMI_PRODUCT_NAME, "dynabook"),
- },
- },
- {
- .ident = "Toshiba Portege M300",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
- DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"),
+ DMI_MATCH(DMI_PRODUCT_NAME , "dynabook"),
},
},
{ }
},
},
{ }
@@
-628,9
+623,10
@@
int synaptics_init(struct psmouse *psmouse)
{
struct synaptics_data *priv;
{
struct synaptics_data *priv;
- psmouse->private = priv = k
z
alloc(sizeof(struct synaptics_data), GFP_KERNEL);
+ psmouse->private = priv = k
m
alloc(sizeof(struct synaptics_data), GFP_KERNEL);
if (!priv)
return -1;
if (!priv)
return -1;
+ memset(priv, 0, sizeof(struct synaptics_data));
if (synaptics_query_hardware(psmouse)) {
printk(KERN_ERR "Unable to query Synaptics hardware.\n");
if (synaptics_query_hardware(psmouse)) {
printk(KERN_ERR "Unable to query Synaptics hardware.\n");