diff options
| author | Mark Brown <broonie@linaro.org> | 2014-04-29 13:01:28 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-29 13:01:28 -0400 |
| commit | 3e93457b45a1a8c69227ce596ee2005fa06f20dd (patch) | |
| tree | 248c27e432533b1af80a9b2240eaa8e48e3b87cc /drivers/base/dd.c | |
| parent | 290414499cf94284a97cc3c33214d13ccfcd896a (diff) | |
| parent | c42ba72ec3a7a1b6aa30122931f1f4b91b601c31 (diff) | |
Merge tag 'ib-mfd-regulator-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-tps65090
Immutable branch between MFD and Regulator due for v3.16 merge-window.
Diffstat (limited to 'drivers/base/dd.c')
| -rw-r--r-- | drivers/base/dd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 06051767393f..8986b9f22781 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c | |||
| @@ -187,8 +187,8 @@ static void driver_bound(struct device *dev) | |||
| 187 | return; | 187 | return; |
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | pr_debug("driver: '%s': %s: bound to device '%s'\n", dev_name(dev), | 190 | pr_debug("driver: '%s': %s: bound to device '%s'\n", dev->driver->name, |
| 191 | __func__, dev->driver->name); | 191 | __func__, dev_name(dev)); |
| 192 | 192 | ||
| 193 | klist_add_tail(&dev->p->knode_driver, &dev->driver->p->klist_devices); | 193 | klist_add_tail(&dev->p->knode_driver, &dev->driver->p->klist_devices); |
| 194 | 194 | ||