diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2022-08-02 21:24:28 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2022-08-02 21:24:28 +0200 |
| commit | db244339fa60b6cda6a2a32adb85be7e08de167e (patch) | |
| tree | d452dd73f4d9100837d0da5fd7d78414db2e9533 /drivers/hid | |
| parent | 86f6710dae39614754d8d97774a082c5abfeff80 (diff) | |
| parent | 842fec058171db8f58a6073502a625372dddd96a (diff) | |
| download | lwn-db244339fa60b6cda6a2a32adb85be7e08de167e.tar.gz lwn-db244339fa60b6cda6a2a32adb85be7e08de167e.zip | |
Merge branch 'for-5.20/nintendo' into for-linus
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-nintendo.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c index 55ede76ab3e4..92ac4f605f13 100644 --- a/drivers/hid/hid-nintendo.c +++ b/drivers/hid/hid-nintendo.c @@ -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 */ @@ -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 */ |