Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'driver-core-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH:
"Here are two driver core fixes for 4.9-rc5.
The first resolves an issue with some drivers not liking to be unbound
and bound again (if CONFIG_DEBUG_TEST_DRIVER_REMOVE is enabled), which
solves some reported problems with graphics and storage drivers. The
other resolves a smatch error with the 4.9-rc1 driver core changes
around this feature.
Both have been in linux-next with no reported issues"
* tag 'driver-core-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
driver core: fix smatch warning on dev->bus check
driver core: skip removal test for non-removable drivers
+3
-2
+3
-2
drivers/base/dd.c
+3
-2
drivers/base/dd.c
···
324
324
{
325
325
int ret = -EPROBE_DEFER;
326
326
int local_trigger_count = atomic_read(&deferred_trigger_count);
327
-
bool test_remove = IS_ENABLED(CONFIG_DEBUG_TEST_DRIVER_REMOVE);
327
+
bool test_remove = IS_ENABLED(CONFIG_DEBUG_TEST_DRIVER_REMOVE) &&
328
+
!drv->suppress_bind_attrs;
328
329
329
330
if (defer_all_probes) {
330
331
/*
···
384
383
if (test_remove) {
385
384
test_remove = false;
386
385
387
-
if (dev->bus && dev->bus->remove)
386
+
if (dev->bus->remove)
388
387
dev->bus->remove(dev);
389
388
else if (drv->remove)
390
389
drv->remove(dev);