Browse Source

w1: omap_hdq: Free resources on error path

In case of error returned by '_omap_hdq_reset()', free resources as done
elsewhere in this function.

This patch slighly changes the semantic of the code. It now propagates the
error code returned by '_omap_hdq_reset()' instead of returning -EINVAL
unconditionally.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Christophe JAILLET 8 years ago
parent
commit
8333eb153a
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/w1/masters/omap_hdq.c

+ 1 - 1
drivers/w1/masters/omap_hdq.c

@@ -715,7 +715,7 @@ static int omap_hdq_probe(struct platform_device *pdev)
 	ret = _omap_hdq_reset(hdq_data);
 	ret = _omap_hdq_reset(hdq_data);
 	if (ret) {
 	if (ret) {
 		dev_dbg(&pdev->dev, "reset failed\n");
 		dev_dbg(&pdev->dev, "reset failed\n");
-		return -EINVAL;
+		goto err_irq;
 	}
 	}
 
 
 	rev = hdq_reg_in(hdq_data, OMAP_HDQ_REVISION);
 	rev = hdq_reg_in(hdq_data, OMAP_HDQ_REVISION);