xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'for-4.16/upstream' and 'for-4.15/upstream-fixes' into for-linus

Browse Source 
Pull assorted small fixes queued for merge window.
This commit is contained in:
Jiri Kosina
2018-01-31 16:23:58 +01:00
parent e56236b0b2 648d493299 7ad81482ca
commit c86aa0129c
8646 changed files with 468706 additions and 179861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/bluetooth/hidp/core.c
View File

@@ -398,9 +398,9 @@ static int hidp_raw_request(struct hid_device *hid, unsigned char reportnum,
}
}
static void hidp_idle_timeout(unsigned long arg)
static void hidp_idle_timeout(struct timer_list *t)
{
struct hidp_session *session = (struct hidp_session *) arg;
struct hidp_session *session = from_timer(session, t, timer);
/* The HIDP user-space API only contains calls to add and remove
* devices. There is no way to forward events of any kind. Therefore,
@@ -944,8 +944,7 @@ static int hidp_session_new(struct hidp_session **out, const bdaddr_t *bdaddr,
/* device management */
INIT_WORK(&session->dev_init, hidp_session_dev_work);
setup_timer(&session->timer, hidp_idle_timeout,
(unsigned long)session);
timer_setup(&session->timer, hidp_idle_timeout, 0);
/* session data */
mutex_init(&session->report_mutex);