From a3216c62474bcf737f44b42f927a4de828a430a5 Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Wed, 1 Apr 2009 01:51:53 -0300 Subject: [PATCH] --- yaml --- r: 142397 b: refs/heads/master c: 7bf56f94a15ac0655bfb259ce693ccab011b1363 h: refs/heads/master i: 142395: 83b04c950cad9cbcaa9096abf53008dbd24a0c6c v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c7a8d6f71b0a..1263c473f899 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b72d715250bf238af86d76ac527dff8d99b601d +refs/heads/master: 7bf56f94a15ac0655bfb259ce693ccab011b1363 diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c index e20ba1e6e0ea..299c1cbc3832 100644 --- a/trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c +++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c @@ -153,14 +153,16 @@ static ssize_t show_def(struct device *class_dev, struct pvr2_sysfs_ctl_item *cip; int val; int ret; + unsigned int cnt = 0; cip = container_of(attr, struct pvr2_sysfs_ctl_item, attr_def); ret = pvr2_ctrl_get_def(cip->cptr, &val); - pvr2_sysfs_trace("pvr2_sysfs(%p) show_def(cid=%d) is %d, stat=%d", - cip->chptr, cip->ctl_id, val, ret); - if (ret < 0) { - return ret; - } - return scnprintf(buf, PAGE_SIZE, "%d\n", val); + if (ret < 0) return ret; + ret = pvr2_ctrl_value_to_sym(cip->cptr, ~0, val, + buf, PAGE_SIZE - 1, &cnt); + pvr2_sysfs_trace("pvr2_sysfs(%p) show_def(cid=%d) is %.*s (%d)", + cip->chptr, cip->ctl_id, cnt, buf, val); + buf[cnt] = '\n'; + return cnt + 1; } static ssize_t show_val_norm(struct device *class_dev,