diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-14 21:08:53 +0300 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-14 21:08:53 +0300 |
| commit | b214b7bbffca8ac6a6f1dad46408f7a9d4219098 (patch) | |
| tree | 2ef03e062e2a04ea9f2d5439b0daea5274a1bc98 /drivers/video/sh_mobile_lcdcfb.c | |
| parent | 7d48ec3698e7b747efa744fd340b0f2d1dbfd3e0 (diff) | |
| parent | 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff) | |
| download | linux-b214b7bbffca8ac6a6f1dad46408f7a9d4219098.tar.xz | |
Merge commit 'v2.6.38-rc4' into spi/next
Diffstat (limited to 'drivers/video/sh_mobile_lcdcfb.c')
| -rw-r--r-- | drivers/video/sh_mobile_lcdcfb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index bd4840a8a6b7..bf12e53aed5c 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c @@ -912,9 +912,9 @@ static int sh_mobile_release(struct fb_info *info, int user) /* Nothing to reconfigure, when called from fbcon */ if (user) { - acquire_console_sem(); + console_lock(); sh_mobile_fb_reconfig(info); - release_console_sem(); + console_unlock(); } mutex_unlock(&ch->open_lock); |