1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/hid/hid-gaff.c b/drivers/hid/hid-gaff.c
index 0f95c96b70f8..ecbd3995a4eb 100644
--- a/drivers/hid/hid-gaff.c
+++ b/drivers/hid/hid-gaff.c
@@ -64,14 +64,20 @@ static int gaff_init(struct hid_device *hid)
 {
         struct gaff_device *gaff;
         struct hid_report *report;
-        struct hid_input *hidinput = list_entry(hid->inputs.next,
-                                                struct hid_input, list);
+        struct hid_input *hidinput;
         struct list_head *report_list =
                         &hid->report_enum[HID_OUTPUT_REPORT].report_list;
         struct list_head *report_ptr = report_list;
-        struct input_dev *dev = hidinput->input;
+        struct input_dev *dev;
         int error;
 
+        if (list_empty(&hid->inputs)) {
+                hid_err(hid, "no inputs found\n");
+                return -ENODEV;
+        }
+        hidinput = list_entry(hid->inputs.next, struct hid_input, list);
+        dev = hidinput->input;
+
         if (list_empty(report_list)) {
                 hid_err(hid, "no output reports found\n");
                 return -ENODEV;