diff options
author | Jiri Kosina <jkosina@suse.cz> | 2018-08-20 18:11:20 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2018-08-20 18:11:20 +0200 |
commit | a91ddf23e2400140382e08eca03786c6e948af86 (patch) | |
tree | 2f375625c4837f06e922c8f17246a9e616bb0aac /drivers/hid/intel-ish-hid | |
parent | 78a8ad7948451f5683fc3bc2791b17094f72b96d (diff) | |
parent | 7f342e9c61d7932b7b3dd8a0b9c2768fe7ca3436 (diff) | |
download | linux-a91ddf23e2400140382e08eca03786c6e948af86.tar.gz linux-a91ddf23e2400140382e08eca03786c6e948af86.tar.bz2 linux-a91ddf23e2400140382e08eca03786c6e948af86.zip |
Merge branch 'for-4.19/upstream' into for-linus
Assorted small driver/core fixes.
Diffstat (limited to 'drivers/hid/intel-ish-hid')
-rw-r--r-- | drivers/hid/intel-ish-hid/ishtp/hbm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/hid/intel-ish-hid/ishtp/hbm.c b/drivers/hid/intel-ish-hid/ishtp/hbm.c index ae4a69f7f2f4..8b5dd580ceec 100644 --- a/drivers/hid/intel-ish-hid/ishtp/hbm.c +++ b/drivers/hid/intel-ish-hid/ishtp/hbm.c @@ -298,7 +298,6 @@ int ishtp_hbm_cl_flow_control_req(struct ishtp_device *dev, struct ishtp_msg_hdr *ishtp_hdr = &hdr; const size_t len = sizeof(struct hbm_flow_control); int rv; - unsigned int num_frags; unsigned long flags; spin_lock_irqsave(&cl->fc_spinlock, flags); @@ -314,7 +313,6 @@ int ishtp_hbm_cl_flow_control_req(struct ishtp_device *dev, return 0; } - num_frags = cl->recv_msg_num_frags; cl->recv_msg_num_frags = 0; rv = ishtp_write_message(dev, ishtp_hdr, data); |