Merge tag 'v4.10-rc5' into next

[thirdparty/linux.git] / drivers / input / mouse / trackpoint.c

diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
index 7331084973e12f75753159833fdf0d1e06126ae8..922ea02edcc3ef6c091b572275245e7d5fabd3f0 100644 (file)
--- a/drivers/input/mouse/trackpoint.c
+++ b/drivers/input/mouse/trackpoint.c
@@ -379,7 +379,7 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
        if (!set_properties)
                return 0;
 
-       if (trackpoint_read(&psmouse->ps2dev, TP_EXT_BTN, &button_info)) {
+       if (trackpoint_read(ps2dev, TP_EXT_BTN, &button_info)) {
                psmouse_warn(psmouse, "failed to get extended button data\n");
                button_info = 0;
        }
@@ -402,7 +402,7 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
 
        trackpoint_defaults(psmouse->private);
 
-       error = trackpoint_power_on_reset(&psmouse->ps2dev);
+       error = trackpoint_power_on_reset(ps2dev);
 
        /* Write defaults to TP only if reset fails. */
        if (error)