samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "soundwire: Suppress errors due to unsupported slave functions"

Browse Source
This commit is contained in:
qctecmdr
2019-05-03 05:15:35 -07:00
committed by Gerrit - the friendly Code Review server
parent 9ef70dacaa 79c9075948
commit dd7590113e
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
soc/swr-mstr-ctrl.c
View File

@@ -2293,7 +2293,12 @@ static int swrm_runtime_resume(struct device *dev)
enable_bank_switch(swrm, 0, SWR_ROW_50, SWR_MIN_COL); enable_bank_switch(swrm, 0, SWR_ROW_50, SWR_MIN_COL);
list_for_each_entry(swr_dev, &mstr->devices, dev_list) { list_for_each_entry(swr_dev, &mstr->devices, dev_list) {
ret = swr_device_up(swr_dev); ret = swr_device_up(swr_dev);
if (ret) { if (ret == -ENODEV) {
dev_dbg(dev,
"%s slave device up not implemented\n",
__func__);
ret = 0;
} else if (ret) {
dev_err(dev, dev_err(dev,
"%s: failed to wakeup swr dev %d\n", "%s: failed to wakeup swr dev %d\n",
__func__, swr_dev->dev_num); __func__, swr_dev->dev_num);
@@ -2358,7 +2363,12 @@ static int swrm_runtime_suspend(struct device *dev)
swr_master_write(swrm, SWRM_COMP_CFG_ADDR, 0x00); swr_master_write(swrm, SWRM_COMP_CFG_ADDR, 0x00);
list_for_each_entry(swr_dev, &mstr->devices, dev_list) { list_for_each_entry(swr_dev, &mstr->devices, dev_list) {
ret = swr_device_down(swr_dev); ret = swr_device_down(swr_dev);
if (ret) { if (ret == -ENODEV) {
dev_dbg_ratelimited(dev,
"%s slave device down not implemented\n",
__func__);
ret = 0;
} else if (ret) {
dev_err(dev, dev_err(dev,
"%s: failed to shutdown swr dev %d\n", "%s: failed to shutdown swr dev %d\n",
__func__, swr_dev->dev_num); __func__, swr_dev->dev_num);