summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2015-04-05 14:06:26 +0200
committerSebastian Reichel <sre@kernel.org>2015-04-05 14:45:27 +0200
commit265ef3ee9575e6d150f485d28dbe153a50d27f4c (patch)
tree9e738bb8573b85dfe436e0666d4c9123d0daa0f9
parentf9c0d76eb47e115f64006a8406f6494387fc428c (diff)
downloadlinux-265ef3ee9575e6d150f485d28dbe153a50d27f4c.tar.bz2
HSI: cmt_speech: fix error return code
Return a negative error code on failure. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ identifier ret; expression e1,e2; @@ ( if (\(ret < 0\|ret != 0\)) { ... return ret; } | ret = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Sebastian Reichel <sre@kernel.org>
-rw-r--r--drivers/hsi/clients/cmt_speech.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hsi/clients/cmt_speech.c b/drivers/hsi/clients/cmt_speech.c
index e9560ef23092..4983529a9c6c 100644
--- a/drivers/hsi/clients/cmt_speech.c
+++ b/drivers/hsi/clients/cmt_speech.c
@@ -1028,6 +1028,7 @@ static int cs_hsi_start(struct cs_hsi_iface **hi, struct hsi_client *cl,
}
hsi_if->master = ssip_slave_get_master(cl);
if (IS_ERR(hsi_if->master)) {
+ err = PTR_ERR(hsi_if->master);
dev_err(&cl->device, "Could not get HSI master client\n");
goto leave4;
}