summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2019-11-29 20:37:10 +0100
committerJiri Kosina <jkosina@suse.cz>2019-11-29 20:37:10 +0100
commit2fa55328f18f38bb85dc57da8c34616430c7bffb (patch)
tree054ab60da7a54c135d65312bfe675465127ea30e /drivers
parentb49b511f417ada27e5e4a8448bac5337e24f3c39 (diff)
parent76f8cf6e0cfdbc5ad88d75c25e7879f0986a7ce0 (diff)
Merge branch 'for-5.5/ish' into for-linus
- typo fix (Geert Uytterhoeven)
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hid/intel-ish-hid/ishtp/hbm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/intel-ish-hid/ishtp/hbm.c b/drivers/hid/intel-ish-hid/ishtp/hbm.c
index c6c9ac09dac3..30a91d068306 100644
--- a/drivers/hid/intel-ish-hid/ishtp/hbm.c
+++ b/drivers/hid/intel-ish-hid/ishtp/hbm.c
@@ -402,7 +402,7 @@ static void ishtp_hbm_cl_connect_res(struct ishtp_device *dev,
* @dev: ISHTP device instance
* @disconnect_req: disconnect request structure
*
- * Disconnect request bus message from the fw. Send diconnect response.
+ * Disconnect request bus message from the fw. Send disconnect response.
*/
static void ishtp_hbm_fw_disconnect_req(struct ishtp_device *dev,
struct hbm_client_connect_request *disconnect_req)