1 files changed, 2 insertions, 15 deletions

diff --git a/drivers/hid/hid-lgff.c b/drivers/hid/hid-lgff.c
index d7ea8c845b40..e1394af0ae7b 100644
--- a/drivers/hid/hid-lgff.c
+++ b/drivers/hid/hid-lgff.c
@@ -128,27 +128,14 @@ static void hid_lgff_set_autocenter(struct input_dev *dev, u16 magnitude)
 int lgff_init(struct hid_device* hid)
 {
         struct hid_input *hidinput = list_entry(hid->inputs.next, struct hid_input, list);
-        struct list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT].report_list;
         struct input_dev *dev = hidinput->input;
-        struct hid_report *report;
-        struct hid_field *field;
         const signed short *ff_bits = ff_joystick;
         int error;
         int i;
 
-        /* Find the report to use */
-        if (list_empty(report_list)) {
-                hid_err(hid, "No output report found\n");
-                return -1;
-        }
-
         /* Check that the report looks ok */
-        report = list_entry(report_list->next, struct hid_report, list);
-        field = report->field[0];
-        if (!field) {
-                hid_err(hid, "NULL field\n");
-                return -1;
-        }
+        if (!hid_validate_values(hid, HID_OUTPUT_REPORT, 0, 0, 7))
+                return -ENODEV;
 
         for (i = 0; i < ARRAY_SIZE(devices); i++) {
                 if (dev->id.vendor == devices[i].idVendor &&