[next] soundwire: intel: fix missing assignment to ret
diff mbox

Message ID 20171221233210.8821-1-colin.king@canonical.com
State New
Headers show

Commit Message

Colin King Dec. 21, 2017, 11:32 p.m. UTC
From: Colin Ian King <colin.king@canonical.com>

Currently the return status ret is being checked but it has not been
updated since the previous check on ret. It appears that assignment of
ret from return status of the call to sdw_cdns_enable_interrupt was
accidentally ommited.  Fix this.

Detected by CoverityScan, CID#1463148 ("Logically dead code")

Fixes: 71bb8a1b059e ("soundwire: intel: Add Intel Master driver")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/soundwire/intel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Vinod Koul Dec. 22, 2017, 3:31 a.m. UTC | #1
On Thu, Dec 21, 2017 at 11:32:10PM +0000, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Currently the return status ret is being checked but it has not been
> updated since the previous check on ret. It appears that assignment of
> ret from return status of the call to sdw_cdns_enable_interrupt was
> accidentally ommited.  Fix this.

Thanks Colin, this looks good to me.

Greg, we have this and another patch from Colin, both lgtm.

Would you like me to collect these and send to you before merge cycle or
apply directly?

> 
> Detected by CoverityScan, CID#1463148 ("Logically dead code")
> 
> Fixes: 71bb8a1b059e ("soundwire: intel: Add Intel Master driver")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/soundwire/intel.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
> index 6a9177ea6eb9..86a7bd1fc912 100644
> --- a/drivers/soundwire/intel.c
> +++ b/drivers/soundwire/intel.c
> @@ -295,7 +295,7 @@ static int intel_probe(struct platform_device *pdev)
>  	if (ret)
>  		goto err_init;
>  
> -	sdw_cdns_enable_interrupt(&sdw->cdns);
> +	ret = sdw_cdns_enable_interrupt(&sdw->cdns);
>  	if (ret)
>  		goto err_init;
>  
> -- 
> 2.14.1
>
gregkh@linuxfoundation.org Dec. 22, 2017, 7:15 a.m. UTC | #2
On Fri, Dec 22, 2017 at 09:01:49AM +0530, Vinod Koul wrote:
> On Thu, Dec 21, 2017 at 11:32:10PM +0000, Colin King wrote:
> > From: Colin Ian King <colin.king@canonical.com>
> > 
> > Currently the return status ret is being checked but it has not been
> > updated since the previous check on ret. It appears that assignment of
> > ret from return status of the call to sdw_cdns_enable_interrupt was
> > accidentally ommited.  Fix this.
> 
> Thanks Colin, this looks good to me.
> 
> Greg, we have this and another patch from Colin, both lgtm.
> 
> Would you like me to collect these and send to you before merge cycle or
> apply directly?

Please collect and then send on, as it is not in my queue at all.

thanks,

greg k-h
Vinod Koul Dec. 22, 2017, 8:10 a.m. UTC | #3
On Fri, Dec 22, 2017 at 08:15:22AM +0100, Greg KH wrote:
> On Fri, Dec 22, 2017 at 09:01:49AM +0530, Vinod Koul wrote:
> > On Thu, Dec 21, 2017 at 11:32:10PM +0000, Colin King wrote:
> > > From: Colin Ian King <colin.king@canonical.com>
> > > 
> > > Currently the return status ret is being checked but it has not been
> > > updated since the previous check on ret. It appears that assignment of
> > > ret from return status of the call to sdw_cdns_enable_interrupt was
> > > accidentally ommited.  Fix this.
> > 
> > Thanks Colin, this looks good to me.
> > 
> > Greg, we have this and another patch from Colin, both lgtm.
> > 
> > Would you like me to collect these and send to you before merge cycle or
> > apply directly?
> 
> Please collect and then send on, as it is not in my queue at all.

Sounds good, will do that
Vinod Koul Dec. 22, 2017, 12:42 p.m. UTC | #4
On Thu, Dec 21, 2017 at 11:32:10PM +0000, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Currently the return status ret is being checked but it has not been
> updated since the previous check on ret. It appears that assignment of
> ret from return status of the call to sdw_cdns_enable_interrupt was
> accidentally ommited.  Fix this.

Applied, thanks

> 
> Detected by CoverityScan, CID#1463148 ("Logically dead code")
> 
> Fixes: 71bb8a1b059e ("soundwire: intel: Add Intel Master driver")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/soundwire/intel.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
> index 6a9177ea6eb9..86a7bd1fc912 100644
> --- a/drivers/soundwire/intel.c
> +++ b/drivers/soundwire/intel.c
> @@ -295,7 +295,7 @@ static int intel_probe(struct platform_device *pdev)
>  	if (ret)
>  		goto err_init;
>  
> -	sdw_cdns_enable_interrupt(&sdw->cdns);
> +	ret = sdw_cdns_enable_interrupt(&sdw->cdns);
>  	if (ret)
>  		goto err_init;
>  
> -- 
> 2.14.1
>

Patch
diff mbox

diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 6a9177ea6eb9..86a7bd1fc912 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -295,7 +295,7 @@  static int intel_probe(struct platform_device *pdev)
 	if (ret)
 		goto err_init;
 
-	sdw_cdns_enable_interrupt(&sdw->cdns);
+	ret = sdw_cdns_enable_interrupt(&sdw->cdns);
 	if (ret)
 		goto err_init;