Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11c8cce8 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

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

parents aa41b233 9584db3c

asoc/codecs/wcd9xxx-core.c

+5 −9
Original line number Diff line number Diff line
@@ -1289,19 +1289,15 @@ static int wcd9xxx_slim_probe(struct slim_device *slim) 
	int ret = 0;

	int intf_type;



	if (!slim)

		return -EINVAL;



	intf_type = wcd9xxx_get_intf_type();



	wcd9xxx = devm_kzalloc(&slim->dev, sizeof(struct wcd9xxx),

				GFP_KERNEL);

	if (!wcd9xxx) {

		ret = -ENOMEM;

		goto err;

	}



	if (!slim) {

		ret = -EINVAL;

		goto err;

	}

	if (!wcd9xxx)

		return -ENOMEM;



	if (intf_type == WCD9XXX_INTERFACE_TYPE_I2C) {

		dev_dbg(&slim->dev, "%s:Codec is detected in I2C mode\n",