From e79a15cc16e96ca1dca8d123619a03bd20bf7133 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Fri, 16 Jul 2010 20:33:10 +0000 Subject: [PATCH] Some more minor sysfs fixes git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1832 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_vdisk.c | 2 +- scst/src/scst_sysfs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index d597de5e3..314118c21 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -3907,7 +3907,7 @@ static ssize_t vdev_sysfs_filename_show(struct kobject *kobj, pos = sprintf(buf, "%s\n", vdev_get_filename(virt_dev)); - if ((virt_dev->filename != NULL) && (virt_dev->dev->type == TYPE_ROM)) + if (virt_dev->filename != NULL) pos += sprintf(&buf[pos], "%s\n", SCST_SYSFS_KEY_MARK); mutex_unlock(&virt_dev->vdev_sysfs_mutex); diff --git a/scst/src/scst_sysfs.c b/scst/src/scst_sysfs.c index 119f8ad05..ae1909979 100644 --- a/scst/src/scst_sysfs.c +++ b/scst/src/scst_sysfs.c @@ -3019,8 +3019,8 @@ static ssize_t scst_setup_id_show(struct kobject *kobj, TRACE_ENTRY(); - count = sprintf(buf, "0x%x%s\n", scst_setup_id, - (scst_setup_id == 0) ? "" : SCST_SYSFS_KEY_MARK "\n"); + count = sprintf(buf, "0x%x\n%s\n", scst_setup_id, + (scst_setup_id == 0) ? "" : SCST_SYSFS_KEY_MARK); TRACE_EXIT(); return count;