mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branches 'asoc/topic/rt298', 'asoc/topic/rt5640', 'asoc/topic/rt5651' and 'asoc/topic/rt5670' into asoc-next

This commit is contained in:
Mark Brown 2015-08-30 15:56:27 +01:00
parent 532161e6cc 5efe58c443 818454d1ab 469444fb13 387ad57fe1
commit a8f1d97bfa
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/rt298.c
View File

@ -1144,8 +1144,6 @@ static int rt298_i2c_probe(struct i2c_client *i2c,
const struct acpi_device_id *acpiid;
int i, ret;
pr_info("%s\n", __func__);
rt298 = devm_kzalloc(&i2c->dev, sizeof(*rt298),
GFP_KERNEL);
if (NULL == rt298)

2
sound/soc/codecs/rt5640.c
View File

@ -2242,7 +2242,7 @@ static int rt5640_i2c_probe(struct i2c_client *i2c,
regmap_read(rt5640->regmap, RT5640_VENDOR_ID2, &val);
if (val != RT5640_DEVICE_ID) {
dev_err(&i2c->dev,
"Device with ID register %x is not rt5640/39\n", val);
"Device with ID register %#x is not rt5640/39\n", val);
return -ENODEV;
}

2
sound/soc/codecs/rt5651.c
View File

@ -1770,7 +1770,7 @@ static int rt5651_i2c_probe(struct i2c_client *i2c,
regmap_read(rt5651->regmap, RT5651_DEVICE_ID, &ret);
if (ret != RT5651_DEVICE_ID_VALUE) {
dev_err(&i2c->dev,
"Device with ID register %x is not rt5651\n", ret);
"Device with ID register %#x is not rt5651\n", ret);
return -ENODEV;
}

2
sound/soc/codecs/rt5670.c
View File

@ -2864,7 +2864,7 @@ static int rt5670_i2c_probe(struct i2c_client *i2c,
regmap_read(rt5670->regmap, RT5670_VENDOR_ID2, &val);
if (val != RT5670_DEVICE_ID) {
dev_err(&i2c->dev,
"Device with ID register %x is not rt5670/72\n", val);
"Device with ID register %#x is not rt5670/72\n", val);
return -ENODEV;
}