git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6
[pandora-kernel.git]
/
drivers
/
video
/
omap2
/
dss
/
dispc.c
diff --git
a/drivers/video/omap2/dss/dispc.c
b/drivers/video/omap2/dss/dispc.c
index
3532782
..
5c81533
100644
(file)
--- a/
drivers/video/omap2/dss/dispc.c
+++ b/
drivers/video/omap2/dss/dispc.c
@@
-1720,12
+1720,11
@@
static int dispc_ovl_calc_scaling(enum omap_plane plane,
const int maxdownscale = dss_feat_get_param_max(FEAT_PARAM_DOWNSCALE);
unsigned long fclk = 0;
const int maxdownscale = dss_feat_get_param_max(FEAT_PARAM_DOWNSCALE);
unsigned long fclk = 0;
- if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0) {
- if (width != out_width || height != out_height)
- return -EINVAL;
- else
- return 0;
- }
+ if (width == out_width && height == out_height)
+ return 0;
+
+ if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0)
+ return -EINVAL;
if (out_width < width / maxdownscale ||
out_width > width * 8)
if (out_width < width / maxdownscale ||
out_width > width * 8)