diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2023-04-27 00:03:00 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2023-04-27 00:03:00 +0300 |
| commit | 5fce154a4d9fcbf897fcaa0ebf084618dd6d751f (patch) | |
| tree | 329caefcf9e06e259d33af1cfb9dc9e7acc2b08d /drivers | |
| parent | 0549fbac401ced4adea4fca44baf8bab7ebcfc74 (diff) | |
| parent | ca6961d8a851f3720175f500be38fe9cee5a2c13 (diff) | |
| download | linux-5fce154a4d9fcbf897fcaa0ebf084618dd6d751f.tar.xz | |
Merge branch 'for-6.4/mcp2221' into for-linus
- generic code improvements for mcp2221 driver (Louis Morhet)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hid/hid-mcp2221.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hid/hid-mcp2221.c b/drivers/hid/hid-mcp2221.c index f74a977cf8f8..72883e0ce757 100644 --- a/drivers/hid/hid-mcp2221.c +++ b/drivers/hid/hid-mcp2221.c @@ -79,8 +79,8 @@ struct mcp_get_gpio { u8 cmd; u8 dummy; struct { - u8 direction; u8 value; + u8 direction; } gpio[MCP_NGPIO]; } __packed; @@ -594,7 +594,7 @@ static int mcp_gpio_get(struct gpio_chip *gc, mcp->txbuf[0] = MCP2221_GPIO_GET; - mcp->gp_idx = offsetof(struct mcp_get_gpio, gpio[offset].value); + mcp->gp_idx = offsetof(struct mcp_get_gpio, gpio[offset]); mutex_lock(&mcp->lock); ret = mcp_send_data_req_status(mcp, mcp->txbuf, 1); @@ -675,7 +675,7 @@ static int mcp_gpio_get_direction(struct gpio_chip *gc, mcp->txbuf[0] = MCP2221_GPIO_GET; - mcp->gp_idx = offsetof(struct mcp_get_gpio, gpio[offset].direction); + mcp->gp_idx = offsetof(struct mcp_get_gpio, gpio[offset]); mutex_lock(&mcp->lock); ret = mcp_send_data_req_status(mcp, mcp->txbuf, 1); |