Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
staging
/
nvec
/
nvec_ps2.c
diff --git
a/kernel/drivers/staging/nvec/nvec_ps2.c
b/kernel/drivers/staging/nvec/nvec_ps2.c
index
0922dd3
..
196f6b0
100644
(file)
--- a/
kernel/drivers/staging/nvec/nvec_ps2.c
+++ b/
kernel/drivers/staging/nvec/nvec_ps2.c
@@
-106,13
+106,12
@@
static int nvec_mouse_probe(struct platform_device *pdev)
{
struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
struct serio *ser_dev;
{
struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
struct serio *ser_dev;
- char mouse_reset[] = { NVEC_PS2, SEND_COMMAND, PSMOUSE_RST, 3 };
- ser_dev =
devm_kzalloc(&pdev->dev,
sizeof(struct serio), GFP_KERNEL);
+ ser_dev =
kzalloc(
sizeof(struct serio), GFP_KERNEL);
if (!ser_dev)
return -ENOMEM;
if (!ser_dev)
return -ENOMEM;
- ser_dev->id.type = SERIO_
PS_PSTHRU
;
+ ser_dev->id.type = SERIO_
8042
;
ser_dev->write = ps2_sendcommand;
ser_dev->start = ps2_startstreaming;
ser_dev->stop = ps2_stopstreaming;
ser_dev->write = ps2_sendcommand;
ser_dev->start = ps2_startstreaming;
ser_dev->stop = ps2_stopstreaming;
@@
-127,9
+126,6
@@
static int nvec_mouse_probe(struct platform_device *pdev)
serio_register_port(ser_dev);
serio_register_port(ser_dev);
- /* mouse reset */
- nvec_write_async(nvec, mouse_reset, sizeof(mouse_reset));
-
return 0;
}
return 0;
}