Skip to content

Commit

Permalink
Merge branch 'for-5.20/nintendo' into for-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
Jiri Kosina committed Aug 2, 2022
2 parents 86f6710 + 842fec0 commit db24433
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/hid/hid-nintendo.c
Original file line number Diff line number Diff line change
Expand Up @@ -1634,6 +1634,7 @@ static int joycon_input_create(struct joycon_ctlr *ctlr)
ctlr->input->id.version = hdev->version;
ctlr->input->uniq = ctlr->mac_addr_str;
ctlr->input->name = name;
ctlr->input->phys = hdev->phys;
input_set_drvdata(ctlr->input, ctlr);

/* set up sticks and buttons */
Expand Down Expand Up @@ -1713,6 +1714,7 @@ static int joycon_input_create(struct joycon_ctlr *ctlr)
ctlr->imu_input->id.version = hdev->version;
ctlr->imu_input->uniq = ctlr->mac_addr_str;
ctlr->imu_input->name = imu_name;
ctlr->imu_input->phys = hdev->phys;
input_set_drvdata(ctlr->imu_input, ctlr);

/* configure imu axes */
Expand Down

0 comments on commit db24433

Please sign in to comment.