diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-30 13:36:49 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-30 13:36:49 -0400 |
commit | fced6dee29f6fb143fe16ea90331176ff77e6120 (patch) | |
tree | 5b6e57e7a757adc2a6518ce291a4d2914397b917 /drivers/gpu/drm/ast/ast_post.c | |
parent | bfed1074f213051e94648bfad0d0611a16d81366 (diff) | |
parent | be1f7c8d7e2bc8b8c76846aa6f276e8d2ef8975a (diff) |
Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos
Diffstat (limited to 'drivers/gpu/drm/ast/ast_post.c')
-rw-r--r-- | drivers/gpu/drm/ast/ast_post.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c index 977cfb35837a..635f6ffc27c2 100644 --- a/drivers/gpu/drm/ast/ast_post.c +++ b/drivers/gpu/drm/ast/ast_post.c | |||
@@ -572,7 +572,7 @@ static u32 cbr_scan2(struct ast_private *ast) | |||
572 | for (loop = 0; loop < CBR_PASSNUM2; loop++) { | 572 | for (loop = 0; loop < CBR_PASSNUM2; loop++) { |
573 | if ((data = cbr_test2(ast)) != 0) { | 573 | if ((data = cbr_test2(ast)) != 0) { |
574 | data2 &= data; | 574 | data2 &= data; |
575 | if (!data) | 575 | if (!data2) |
576 | return 0; | 576 | return 0; |
577 | break; | 577 | break; |
578 | } | 578 | } |