diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-13 10:22:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-13 10:22:07 -0800 |
| commit | cf2b191cbac23d92a9b0319f80c6d274690cb9c0 (patch) | |
| tree | 531d5c124f1b209c6283056accd988961b4dcce5 | |
| parent | 85b9df7aa5080a4e8cba38fe3a56b73a8f8987ef (diff) | |
| parent | bdacd1b426db83ac8ecf21aef1848120ffe53c07 (diff) | |
| download | linux-cf2b191cbac23d92a9b0319f80c6d274690cb9c0.tar.gz | |
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
| -rw-r--r-- | drivers/base/dd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index d22a7260f42b26..d76cd97a98b6ba 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -324,7 +324,8 @@ static int really_probe(struct device *dev, struct device_driver *drv) { int ret = -EPROBE_DEFER; int local_trigger_count = atomic_read(&deferred_trigger_count); - bool test_remove = IS_ENABLED(CONFIG_DEBUG_TEST_DRIVER_REMOVE); + bool test_remove = IS_ENABLED(CONFIG_DEBUG_TEST_DRIVER_REMOVE) && + !drv->suppress_bind_attrs; if (defer_all_probes) { /* @@ -383,7 +384,7 @@ re_probe: if (test_remove) { test_remove = false; - if (dev->bus && dev->bus->remove) + if (dev->bus->remove) dev->bus->remove(dev); else if (drv->remove) drv->remove(dev); |