diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-13 18:52:59 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-13 18:52:59 +0000 |
| commit | 358194677ff980dd058b521295f3f76c20cfdfc8 (patch) | |
| tree | 40ddafbf592743e04a01717f3ba5e52953630ab5 /drivers/video/adf/adf_fbdev.c | |
| parent | 5a4b318f126a97d1ec0ef12ce5833576698e88de (diff) | |
| parent | 679160a872dfe88bf34e50f1939e190ba59e534e (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
Conflicts:
drivers/staging/android/ion/ion_chunk_heap.c
kernel/printk.c
Diffstat (limited to 'drivers/video/adf/adf_fbdev.c')
| -rw-r--r-- | drivers/video/adf/adf_fbdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/adf/adf_fbdev.c b/drivers/video/adf/adf_fbdev.c index 477abd63ccc..cac34d14cbc 100644 --- a/drivers/video/adf/adf_fbdev.c +++ b/drivers/video/adf/adf_fbdev.c @@ -519,10 +519,10 @@ int adf_fbdev_blank(int blank, struct fb_info *info) dpms_state = DRM_MODE_DPMS_STANDBY; break; case FB_BLANK_VSYNC_SUSPEND: - dpms_state = DRM_MODE_DPMS_STANDBY; + dpms_state = DRM_MODE_DPMS_SUSPEND; break; case FB_BLANK_HSYNC_SUSPEND: - dpms_state = DRM_MODE_DPMS_SUSPEND; + dpms_state = DRM_MODE_DPMS_STANDBY; break; case FB_BLANK_POWERDOWN: dpms_state = DRM_MODE_DPMS_OFF; |