diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-11-15 15:10:36 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-11-15 15:10:36 -0800 |
| commit | 4327974639c4d7f8688f564081956f8f79ef053c (patch) | |
| tree | 0ca57c56b2f76a39f476e8f22b0112aa566b3a86 /drivers/video/fbmem.c | |
| parent | c3e5127312f97482a6a09c0df602c726675eff5b (diff) | |
| parent | f6b252b6b92671d2633008408c06d35c26e55ecf (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebase
Diffstat (limited to 'drivers/video/fbmem.c')
| -rw-r--r-- | drivers/video/fbmem.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 5aac00eb183..ad936295d8f 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -1738,8 +1738,6 @@ void fb_set_suspend(struct fb_info *info, int state) { struct fb_event event; - if (!lock_fb_info(info)) - return; event.info = info; if (state) { fb_notifier_call_chain(FB_EVENT_SUSPEND, &event); @@ -1748,7 +1746,6 @@ void fb_set_suspend(struct fb_info *info, int state) info->state = FBINFO_STATE_RUNNING; fb_notifier_call_chain(FB_EVENT_RESUME, &event); } - unlock_fb_info(info); } /** |