1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 0b2dcd0ee591..386765654cf6 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -271,6 +271,8 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                         }
                         return 1;
                 case HID_DG_CONTACTID:
+                        if (!td->maxcontacts)
+                                td->maxcontacts = MT_DEFAULT_MAXCONTACT;
                         input_mt_init_slots(hi->input, td->maxcontacts);
                         td->last_slot_field = usage->hid;
                         td->last_field_index = field->index;
@@ -547,9 +549,6 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
         if (ret)
                 goto fail;
 
-        if (!td->maxcontacts)
-                td->maxcontacts = MT_DEFAULT_MAXCONTACT;
-
         td->slots = kzalloc(td->maxcontacts * sizeof(struct mt_slot),
                                 GFP_KERNEL);
         if (!td->slots) {