Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[thirdparty/linux.git] / drivers / hid / hid-rmi.c

diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
index 7f41213d5ae3430be88e7ac499c39f68daa9ae52..311eee599ce97e819ba9d2b25a15de70696468bc 100644 (file)
--- a/drivers/hid/hid-rmi.c
+++ b/drivers/hid/hid-rmi.c
@@ -720,7 +720,7 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id)
        }
 
        if (data->device_flags & RMI_DEVICE_HAS_PHYS_BUTTONS)
-               rmi_hid_pdata.f30_data.disable = true;
+               rmi_hid_pdata.gpio_data.disable = true;
 
        data->xport.dev = hdev->dev.parent;
        data->xport.pdata = rmi_hid_pdata;