aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse
diff options
context:
space:
mode:
authorGeyslan G. Bem <geyslan@gmail.com>2013-10-16 19:52:14 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-10-31 04:01:30 -0400
commitc2e609599a57926f20b324d05b164aabe9e372ed (patch)
tree2476a6cfa2a8043add1b9055bdfc0a9423c096c1 /drivers/input/mouse
parent33777f34b5cc16a9fb2cd480e7db84c8de631fde (diff)
Input: cypress_ps2 - remove useless cast
Get rid of unnecessary (void *) casting in 'cypress_init' function. Signed-off-by: Geyslan G. Bem <geyslan@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/mouse')
-rw-r--r--drivers/input/mouse/cypress_ps2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/mouse/cypress_ps2.c b/drivers/input/mouse/cypress_ps2.c
index ef651ccf130f..1d81a7467501 100644
--- a/drivers/input/mouse/cypress_ps2.c
+++ b/drivers/input/mouse/cypress_ps2.c
@@ -680,14 +680,14 @@ int cypress_init(struct psmouse *psmouse)
680 struct cytp_data *cytp; 680 struct cytp_data *cytp;
681 681
682 cytp = kzalloc(sizeof(struct cytp_data), GFP_KERNEL); 682 cytp = kzalloc(sizeof(struct cytp_data), GFP_KERNEL);
683 psmouse->private = (void *)cytp; 683 if (!cytp)
684 if (cytp == NULL)
685 return -ENOMEM; 684 return -ENOMEM;
686 685
687 cypress_reset(psmouse); 686 psmouse->private = cytp;
688
689 psmouse->pktsize = 8; 687 psmouse->pktsize = 8;
690 688
689 cypress_reset(psmouse);
690
691 if (cypress_query_hardware(psmouse)) { 691 if (cypress_query_hardware(psmouse)) {
692 psmouse_err(psmouse, "Unable to query Trackpad hardware.\n"); 692 psmouse_err(psmouse, "Unable to query Trackpad hardware.\n");
693 goto err_exit; 693 goto err_exit;