diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-15 18:27:20 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-15 18:27:20 +0100 |
| commit | c0106d72b8d71696dbe9dc80e2c77d4ac63f7531 (patch) | |
| tree | ca96d2baecb0555e36219ed6968dc8e306e530ca /drivers/hwmon/hwmon.c | |
| parent | 5852973c129cf7c7e6c229abb7250673fc2a50c9 (diff) | |
| parent | eff317d0834ad1ff03f747f6bc2d76b9a9c95160 (diff) | |
| download | kernel-crypto-c0106d72b8d71696dbe9dc80e2c77d4ac63f7531.tar.gz kernel-crypto-c0106d72b8d71696dbe9dc80e2c77d4ac63f7531.tar.xz kernel-crypto-c0106d72b8d71696dbe9dc80e2c77d4ac63f7531.zip | |
Merge branch 'topic/asoc' into next/asoc
Diffstat (limited to 'drivers/hwmon/hwmon.c')
| -rw-r--r-- | drivers/hwmon/hwmon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c index 076a59cdabe..e15c3e7b07e 100644 --- a/drivers/hwmon/hwmon.c +++ b/drivers/hwmon/hwmon.c @@ -76,7 +76,7 @@ void hwmon_device_unregister(struct device *dev) { int id; - if (likely(sscanf(dev->bus_id, HWMON_ID_FORMAT, &id) == 1)) { + if (likely(sscanf(dev_name(dev), HWMON_ID_FORMAT, &id) == 1)) { device_unregister(dev); spin_lock(&idr_lock); idr_remove(&hwmon_idr, id); |