From: Dan Carpenter Date: Mon, 22 Sep 2014 08:00:08 +0000 (-0300) Subject: [media] davinci: remove an unneeded check X-Git-Tag: firefly_0821_release~176^2~2474^2~486 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=692f637522f0ae230fe49aab3776603d5e2c5f31;p=firefly-linux-kernel-4.4.55.git [media] davinci: remove an unneeded check We don't need to check "ret", we know it's zero. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c index 3ff817b80f22..de55f47a77db 100644 --- a/drivers/media/platform/davinci/vpfe_capture.c +++ b/drivers/media/platform/davinci/vpfe_capture.c @@ -442,11 +442,10 @@ static int vpfe_config_image_format(struct vpfe_device *vpfe_dev, return ret; /* Update the values of sizeimage and bytesperline */ - if (!ret) { - pix->bytesperline = ccdc_dev->hw_ops.get_line_length(); - pix->sizeimage = pix->bytesperline * pix->height; - } - return ret; + pix->bytesperline = ccdc_dev->hw_ops.get_line_length(); + pix->sizeimage = pix->bytesperline * pix->height; + + return 0; } static int vpfe_initialize_device(struct vpfe_device *vpfe_dev)