pktcdvd: fix error return code

JuliaLawall · Jiri Kosina · commit 8586ea96b4f9 · 2014-01-03T10:05:34.000+01:00
Set the return variable to an error code as done elsewhere in the function. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> ( if@p1 (\(ret < 0\|ret != 0\)) { ... return ret; } | ret@p1 = 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: Jiri Kosina <jkosina@suse.cz>
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
@@ -706,7 +706,9 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command *
 			     WRITE : READ, __GFP_WAIT);
 
 	if (cgc->buflen) {
-		if (blk_rq_map_kern(q, rq, cgc->buffer, cgc->buflen, __GFP_WAIT))
+		ret = blk_rq_map_kern(q, rq, cgc->buffer, cgc->buflen,
+				      __GFP_WAIT);
+		if (ret)
 			goto out;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -706,7 +706,9 @@ static int pkt_generic_packet(struct pktcdvd_device pd, struct packet_command `
`706`	`706`	`WRITE : READ, __GFP_WAIT);`
`707`	`707`
`708`	`708`	`if (cgc->buflen) {`
`709`		`- if (blk_rq_map_kern(q, rq, cgc->buffer, cgc->buflen, __GFP_WAIT))`
	`709`	`+ ret = blk_rq_map_kern(q, rq, cgc->buffer, cgc->buflen,`
	`710`	`+ __GFP_WAIT);`
	`711`	`+ if (ret)`
`710`	`712`	`goto out;`
`711`	`713`	`}`
`712`	`714`