From: Sakari Ailus Date: Mon, 9 Mar 2015 23:44:40 +0000 (-0300) Subject: [media] smiapp: Clean up smiapp_get_pdata() X-Git-Tag: firefly_0821_release~176^2~795^2~1119 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0fd68f2f7aee2343f2396188362ba41447d8004f;p=firefly-linux-kernel-4.4.55.git [media] smiapp: Clean up smiapp_get_pdata() Don't set rval when it's not used (the function returns a pointer to struct smiapp_platform_data). Signed-off-by: Sakari Ailus Acked-by: Lad, Prabhakar Acked-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c index f714eb7f4092..557f25def3a0 100644 --- a/drivers/media/i2c/smiapp/smiapp-core.c +++ b/drivers/media/i2c/smiapp/smiapp-core.c @@ -2988,10 +2988,8 @@ static struct smiapp_platform_data *smiapp_get_pdata(struct device *dev) return NULL; pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); - if (!pdata) { - rval = -ENOMEM; + if (!pdata) goto out_err; - } v4l2_of_parse_endpoint(ep, &bus_cfg); @@ -3001,7 +2999,6 @@ static struct smiapp_platform_data *smiapp_get_pdata(struct device *dev) break; /* FIXME: add CCP2 support. */ default: - rval = -EINVAL; goto out_err; }