Commit 16bf5e82 authored by Tang Bin's avatar Tang Bin Committed by Mark Brown

ASoC: qcom: qdsp6: Use IS_ERR() instead of IS_ERR_OR_NULL()

In the function q6adm_open(), q6adm_alloc_copp() doesn't return
NULL. Thus use IS_ERR() to validate the returned value instead
of IS_ERR_OR_NULL(). And delete the extra line.
Signed-off-by: default avatarZhang Shengju <zhangshengju@cmss.chinamobile.com>
Signed-off-by: default avatarTang Bin <tangbin@cmss.chinamobile.com>
Link: https://lore.kernel.org/r/20200714112744.20560-1-tangbin@cmss.chinamobile.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 969943bf
...@@ -403,7 +403,7 @@ struct q6copp *q6adm_open(struct device *dev, int port_id, int path, int rate, ...@@ -403,7 +403,7 @@ struct q6copp *q6adm_open(struct device *dev, int port_id, int path, int rate,
spin_lock_irqsave(&adm->copps_list_lock, flags); spin_lock_irqsave(&adm->copps_list_lock, flags);
copp = q6adm_alloc_copp(adm, port_id); copp = q6adm_alloc_copp(adm, port_id);
if (IS_ERR_OR_NULL(copp)) { if (IS_ERR(copp)) {
spin_unlock_irqrestore(&adm->copps_list_lock, flags); spin_unlock_irqrestore(&adm->copps_list_lock, flags);
return ERR_CAST(copp); return ERR_CAST(copp);
} }
...@@ -419,7 +419,6 @@ struct q6copp *q6adm_open(struct device *dev, int port_id, int path, int rate, ...@@ -419,7 +419,6 @@ struct q6copp *q6adm_open(struct device *dev, int port_id, int path, int rate,
copp->bit_width = bit_width; copp->bit_width = bit_width;
copp->app_type = app_type; copp->app_type = app_type;
ret = q6adm_device_open(adm, copp, port_id, path, topology, ret = q6adm_device_open(adm, copp, port_id, path, topology,
channel_mode, bit_width, rate); channel_mode, bit_width, rate);
if (ret < 0) { if (ret < 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment