diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 20:53:16 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 20:53:16 (GMT) |
| commit | 74a205a3f1a07cf0b72bf7816d75735a0d9c4c6b (patch) | |
| tree | d977fe81c74a0728130c7e212f2c27eef8146e91 /drivers/base/base.h | |
| parent | dd26bf6d95f050c42cc8f15e750b09851e1fd30b (diff) | |
| parent | 912335c43bb10d124471bf063a85e132aa814214 (diff) | |
| download | linux-fsl-qoriq-74a205a3f1a07cf0b72bf7816d75735a0d9c4c6b.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
UIO: fix specific device driver missing statement for depmod
Driver core: remove pr_fmt() from dynamic_dev_dbg() printk
driver core: prevent device_for_each_child from oopsing
dynamic debug: resurrect old pr_debug() semantics as pr_devel()
Driver Core: early platform driver
proc: mounts_poll() make consistent to mdstat_poll
sysfs: sysfs poll keep the poll rule of regular file.
driver core: allow non-root users to listen to uevents
driver core: fix driver_match_device
sysfs: don't use global workqueue in sysfs_schedule_callback()
Diffstat (limited to 'drivers/base/base.h')
| -rw-r--r-- | drivers/base/base.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/base.h b/drivers/base/base.h index ddc9749..b528145 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -115,7 +115,7 @@ extern int driver_probe_device(struct device_driver *drv, struct device *dev); static inline int driver_match_device(struct device_driver *drv, struct device *dev) { - return drv->bus->match && drv->bus->match(dev, drv); + return drv->bus->match ? drv->bus->match(dev, drv) : 1; } extern void sysdev_shutdown(void); |