Skip to content

L
linux
Commit 5fce154a authored by Jiri Kosina's avatar Jiri Kosina
Browse files
Options

Merge branch 'for-6.4/mcp2221' into for-linus 

- generic code improvements for mcp2221 driver (Louis Morhet)
parents 0549fbac ca6961d8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
drivers/hid/hid-mcp2221.c
View file @ 5fce154a
...@@ -79,8 +79,8 @@ struct mcp_get_gpio { ...@@ -79,8 +79,8 @@ struct mcp_get_gpio {
u8 cmd; u8 cmd;
u8 dummy; u8 dummy;
struct { struct {
u8 direction;
u8 value; u8 value;
u8 direction;
} gpio[MCP_NGPIO]; } gpio[MCP_NGPIO];
} __packed; } __packed;
...@@ -594,7 +594,7 @@ static int mcp_gpio_get(struct gpio_chip *gc, ...@@ -594,7 +594,7 @@ static int mcp_gpio_get(struct gpio_chip *gc,
mcp->txbuf[0] = MCP2221_GPIO_GET; 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); mutex_lock(&mcp->lock);
ret = mcp_send_data_req_status(mcp, mcp->txbuf, 1); ret = mcp_send_data_req_status(mcp, mcp->txbuf, 1);
...@@ -675,7 +675,7 @@ static int mcp_gpio_get_direction(struct gpio_chip *gc, ...@@ -675,7 +675,7 @@ static int mcp_gpio_get_direction(struct gpio_chip *gc,
mcp->txbuf[0] = MCP2221_GPIO_GET; 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); mutex_lock(&mcp->lock);
ret = mcp_send_data_req_status(mcp, mcp->txbuf, 1); ret = mcp_send_data_req_status(mcp, mcp->txbuf, 1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7