From: Lisa Nguyen <lisa@xenapiadmin.com>
Date: Wed, 11 Dec 2013 06:09:22 +0000 (-0300)
Subject: [media] staging: media: davinci_vpfe: Rewrite return statement in vpfe_video.c
X-Git-Tag: v3.14-rc1~20^2~277
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3e6e3b3d3d6877e5b9fe0c2cd9788127a4974a3d;p=~emulex%2Finfiniband.git

[media] staging: media: davinci_vpfe: Rewrite return statement in vpfe_video.c

Rewrite the return statement in vpfe_video.c. This will prevent
the checkpatch.pl script from generating a warning saying
to remove () from this particular return statement.

Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---

diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c
index 24d98a6866b..3b036bef8c4 100644
--- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
+++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
@@ -346,7 +346,7 @@ static int vpfe_pipeline_disable(struct vpfe_pipeline *pipe)
 	}
 	mutex_unlock(&mdev->graph_mutex);
 
-	return (ret == 0) ? ret : -ETIMEDOUT ;
+	return ret ? -ETIMEDOUT : 0;
 }
 
 /*