diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/video/display/display-sysfs.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.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); |