diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/video/display/display-sysfs.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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); |