diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /drivers/video/display/display-sysfs.c | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'drivers/video/display/display-sysfs.c')
| -rw-r--r-- | drivers/video/display/display-sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/display/display-sysfs.c b/drivers/video/display/display-sysfs.c index f6a09ab0dac6..0c647d7af0ee 100644 --- a/drivers/video/display/display-sysfs.c +++ b/drivers/video/display/display-sysfs.c | |||
| @@ -182,7 +182,7 @@ void display_device_unregister(struct display_device *ddev) | |||
| 182 | mutex_lock(&ddev->lock); | 182 | mutex_lock(&ddev->lock); |
| 183 | device_unregister(ddev->dev); | 183 | device_unregister(ddev->dev); |
| 184 | mutex_unlock(&ddev->lock); | 184 | mutex_unlock(&ddev->lock); |
| 185 | // Mark device index as avaliable | 185 | // Mark device index as available |
| 186 | mutex_lock(&allocated_dsp_lock); | 186 | mutex_lock(&allocated_dsp_lock); |
| 187 | idr_remove(&allocated_dsp, ddev->idx); | 187 | idr_remove(&allocated_dsp, ddev->idx); |
| 188 | mutex_unlock(&allocated_dsp_lock); | 188 | mutex_unlock(&allocated_dsp_lock); |