Merge branch 'asoc-5.3' into asoc-linus
This commit is contained in:
@@ -188,7 +188,7 @@ static ssize_t fw_softreg_read(struct file *file, char __user *user_buf,
|
||||
memset(d->fw_read_buff, 0, FW_REG_BUF);
|
||||
|
||||
if (w0_stat_sz > 0)
|
||||
__iowrite32_copy(d->fw_read_buff, fw_reg_addr, w0_stat_sz >> 2);
|
||||
__ioread32_copy(d->fw_read_buff, fw_reg_addr, w0_stat_sz >> 2);
|
||||
|
||||
for (offset = 0; offset < FW_REG_SIZE; offset += 16) {
|
||||
ret += snprintf(tmp + ret, FW_REG_BUF - ret, "%#.4x: ", offset);
|
||||
|
@@ -225,7 +225,7 @@ int skl_nhlt_update_topology_bin(struct skl *skl)
|
||||
struct hdac_bus *bus = skl_to_bus(skl);
|
||||
struct device *dev = bus->dev;
|
||||
|
||||
dev_dbg(dev, "oem_id %.6s, oem_table_id %8s oem_revision %d\n",
|
||||
dev_dbg(dev, "oem_id %.6s, oem_table_id %.8s oem_revision %d\n",
|
||||
nhlt->header.oem_id, nhlt->header.oem_table_id,
|
||||
nhlt->header.oem_revision);
|
||||
|
||||
|
Viittaa uudesa ongelmassa
Block a user