diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /drivers/rtc/class.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/rtc/class.c')
| -rw-r--r-- | drivers/rtc/class.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c index 5396beec30d0..1cb61a761cb2 100644 --- a/drivers/rtc/class.c +++ b/drivers/rtc/class.c | |||
| @@ -94,7 +94,9 @@ exit_kfree: | |||
| 94 | kfree(rtc); | 94 | kfree(rtc); |
| 95 | 95 | ||
| 96 | exit_idr: | 96 | exit_idr: |
| 97 | mutex_lock(&idr_lock); | ||
| 97 | idr_remove(&rtc_idr, id); | 98 | idr_remove(&rtc_idr, id); |
| 99 | mutex_unlock(&idr_lock); | ||
| 98 | 100 | ||
| 99 | exit: | 101 | exit: |
| 100 | dev_err(dev, "rtc core: unable to register %s, err = %d\n", | 102 | dev_err(dev, "rtc core: unable to register %s, err = %d\n", |