Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'char-misc-4.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver fixes from Greg KH:
"Here's some tiny char and misc driver fixes that resolve some reported
errors for 4.3-rc3.
All of these have been in linux-next with no problems for a while"
* tag 'char-misc-4.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
extcon: Fix attached value returned by is_extcon_changed
Drivers: hv: vmbus: fix init_vp_index() for reloading hv_netvsc
mei: fix debugfs files leak on error path
thunderbolt: Allow loading of module on recent Apple MacBooks with thunderbolt 2 controller
+21
-3
+1
-1
drivers/extcon/extcon.c
+1
-1
drivers/extcon/extcon.c
+17
drivers/hv/channel_mgmt.c
+17
drivers/hv/channel_mgmt.c
···
204
204
spin_lock_irqsave(&vmbus_connection.channel_lock, flags);
205
205
list_del(&channel->listentry);
206
206
spin_unlock_irqrestore(&vmbus_connection.channel_lock, flags);
207
+
208
+
primary_channel = channel;
207
209
} else {
208
210
primary_channel = channel->primary_channel;
209
211
spin_lock_irqsave(&primary_channel->lock, flags);
···
213
211
primary_channel->num_sc--;
214
212
spin_unlock_irqrestore(&primary_channel->lock, flags);
215
213
}
214
+
215
+
/*
216
+
* We need to free the bit for init_vp_index() to work in the case
217
+
* of sub-channel, when we reload drivers like hv_netvsc.
218
+
*/
219
+
cpumask_clear_cpu(channel->target_cpu,
220
+
&primary_channel->alloced_cpus_in_node);
221
+
216
222
free_channel(channel);
217
223
}
218
224
···
468
458
continue;
469
459
}
470
460
461
+
/*
462
+
* NOTE: in the case of sub-channel, we clear the sub-channel
463
+
* related bit(s) in primary->alloced_cpus_in_node in
464
+
* hv_process_channel_removal(), so when we reload drivers
465
+
* like hv_netvsc in SMP guest, here we're able to re-allocate
466
+
* bit from primary->alloced_cpus_in_node.
467
+
*/
471
468
if (!cpumask_test_cpu(cur_cpu,
472
469
&primary->alloced_cpus_in_node)) {
473
470
cpumask_set_cpu(cur_cpu,
+2
-1
drivers/misc/mei/debugfs.c
+2
-1
drivers/misc/mei/debugfs.c
···
204
204
if (!dir)
205
205
return -ENOMEM;
206
206
207
+
dev->dbgfs_dir = dir;
208
+
207
209
f = debugfs_create_file("meclients", S_IRUSR, dir,
208
210
dev, &mei_dbgfs_fops_meclients);
209
211
if (!f) {
···
230
228
dev_err(dev->dev, "allow_fixed_address: registration failed\n");
231
229
goto err;
232
230
}
233
-
dev->dbgfs_dir = dir;
234
231
return 0;
235
232
err:
236
233
mei_dbgfs_deregister(dev);
+1
-1
drivers/thunderbolt/nhi.c
+1
-1
drivers/thunderbolt/nhi.c