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

Merge "asoc: codecs: Fix NULL pointer dereference in wcd9xxx slim probe"

Browse Source
This commit is contained in:
qctecmdr
2019-06-28 22:45:29 -07:00
committed by Gerrit - the friendly Code Review server
parent aa41b233f8 9584db3c2d
commit 11c8cce88b
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
asoc/codecs/wcd9xxx-core.c
View File

@@ -1289,19 +1289,15 @@ static int wcd9xxx_slim_probe(struct slim_device *slim)
int ret = 0; int ret = 0;
int intf_type; int intf_type;
if (!slim)
return -EINVAL;
intf_type = wcd9xxx_get_intf_type(); intf_type = wcd9xxx_get_intf_type();
wcd9xxx = devm_kzalloc(&slim->dev, sizeof(struct wcd9xxx), wcd9xxx = devm_kzalloc(&slim->dev, sizeof(struct wcd9xxx),
GFP_KERNEL); GFP_KERNEL);
if (!wcd9xxx) { if (!wcd9xxx)
ret = -ENOMEM; return -ENOMEM;
goto err;
}
if (!slim) {
ret = -EINVAL;
goto err;
}
if (intf_type == WCD9XXX_INTERFACE_TYPE_I2C) { if (intf_type == WCD9XXX_INTERFACE_TYPE_I2C) {
dev_dbg(&slim->dev, "%s:Codec is detected in I2C mode\n", dev_dbg(&slim->dev, "%s:Codec is detected in I2C mode\n",