diff options
author | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:34:28 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:34:28 +0200 |
commit | 4e7be68e8d0f7bb3c030cdfa442d298457197751 (patch) | |
tree | b5541a91b5f4742d6e2c13d92ffb101fc06f6452 /drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | |
parent | Merge branch 'for-4.20/google' into for-linus (diff) | |
parent | HID: i2c-hid: override HID descriptors for certain devices (diff) | |
download | linux-4e7be68e8d0f7bb3c030cdfa442d298457197751.tar.xz linux-4e7be68e8d0f7bb3c030cdfa442d298457197751.zip |
Merge branch 'for-4.20/i2c-hid' into for-linus
- general cleanups of hid-i2c driver
- SPIODEV device descriptor fixes
Diffstat (limited to 'drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h')
-rw-r--r-- | drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h b/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h index 6a6d927b78b0..e7c6bfefaf9e 100644 --- a/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h +++ b/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h @@ -207,7 +207,7 @@ struct ishtp_device { struct work_struct bh_hbm_work; /* IPC write queue */ - struct wr_msg_ctl_info wr_processing_list_head, wr_free_list_head; + struct list_head wr_processing_list, wr_free_list; /* For both processing list and free list */ spinlock_t wr_processing_spinlock; |