OMAPDSS: fix WARN_ON in 'alpha_blending_enabled' sysfs file

The code handling 'alpha_blending_enabled' sysfs file contains WARN_ONs
in case the feature is not supported on the current platform. Even
though only root can write to the file, anyone can read it, thus causing
the kernel to get tainted and printing an ugly warning.

Instead of having WARN_ONs, return a proper error if the feature is not
supported.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk>
This commit is contained in:
Tomi Valkeinen 2013-08-27 14:28:03 +03:00
parent db680c6515
commit 3825ce5a9b
1 changed files with 5 additions and 3 deletions

View File

@ -285,9 +285,10 @@ static ssize_t manager_alpha_blending_enabled_show(
{ {
struct omap_overlay_manager_info info; struct omap_overlay_manager_info info;
mgr->get_manager_info(mgr, &info); if(!dss_has_feature(FEAT_ALPHA_FIXED_ZORDER))
return -ENODEV;
WARN_ON(!dss_has_feature(FEAT_ALPHA_FIXED_ZORDER)); mgr->get_manager_info(mgr, &info);
return snprintf(buf, PAGE_SIZE, "%d\n", return snprintf(buf, PAGE_SIZE, "%d\n",
info.partial_alpha_enabled); info.partial_alpha_enabled);
@ -301,7 +302,8 @@ static ssize_t manager_alpha_blending_enabled_store(
bool enable; bool enable;
int r; int r;
WARN_ON(!dss_has_feature(FEAT_ALPHA_FIXED_ZORDER)); if(!dss_has_feature(FEAT_ALPHA_FIXED_ZORDER))
return -ENODEV;
r = strtobool(buf, &enable); r = strtobool(buf, &enable);
if (r) if (r)