aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/catpt/sysfs.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/intel/catpt/sysfs.c')
-rw-r--r--sound/soc/intel/catpt/sysfs.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/intel/catpt/sysfs.c b/sound/soc/intel/catpt/sysfs.c
index 9579e233a15d..9b6d2d93a2e7 100644
--- a/sound/soc/intel/catpt/sysfs.c
+++ b/sound/soc/intel/catpt/sysfs.c
@@ -15,7 +15,9 @@ static ssize_t fw_version_show(struct device *dev,
struct catpt_fw_version version;
int ret;
- pm_runtime_get_sync(cdev->dev);
+ ret = pm_runtime_resume_and_get(cdev->dev);
+ if (ret < 0 && ret != -EACCES)
+ return ret;
ret = catpt_ipc_get_fw_version(cdev, &version);
@@ -25,8 +27,8 @@ static ssize_t fw_version_show(struct device *dev,
if (ret)
return CATPT_IPC_ERROR(ret);
- return sprintf(buf, "%d.%d.%d.%d\n", version.type, version.major,
- version.minor, version.build);
+ return sysfs_emit(buf, "%d.%d.%d.%d\n", version.type, version.major,
+ version.minor, version.build);
}
static DEVICE_ATTR_RO(fw_version);
@@ -35,7 +37,7 @@ static ssize_t fw_info_show(struct device *dev,
{
struct catpt_dev *cdev = dev_get_drvdata(dev);
- return sprintf(buf, "%s\n", cdev->ipc.config.fw_info);
+ return sysfs_emit(buf, "%s\n", cdev->ipc.config.fw_info);
}
static DEVICE_ATTR_RO(fw_info);