Merge branch 'for-5.5/ish' into for-linus

Jiri Kosina · Jiri Kosina · commit 2fa55328f18f · 2019-11-29T20:37:10.000+01:00
- typo fix (Geert Uytterhoeven)
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ static void ishtp_hbm_cl_connect_res(struct ishtp_device *dev,`
`402`	`402`	`* @dev: ISHTP device instance`
`403`	`403`	`* @disconnect_req: disconnect request structure`
`404`	`404`	`*`
`405`		`- * Disconnect request bus message from the fw. Send diconnect response.`
	`405`	`+ * Disconnect request bus message from the fw. Send disconnect response.`
`406`	`406`	`*/`
`407`	`407`	`static void ishtp_hbm_fw_disconnect_req(struct ishtp_device *dev,`
`408`	`408`	`struct hbm_client_connect_request *disconnect_req)`