From eb3e43505d317ffc9296b2f3eb7c9773df0cfb0d Mon Sep 17 00:00:00 2001 From: Patrik Jakobsson Date: Sun, 6 Dec 2015 14:45:38 +0100 Subject: [PATCH] facetimehd: Allow loading of set file to fail Signed-off-by: Patrik Jakobsson --- fthd_isp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fthd_isp.c b/fthd_isp.c index 151c502..58b84af 100644 --- a/fthd_isp.c +++ b/fthd_isp.c @@ -445,7 +445,8 @@ static int fthd_isp_cmd_powerdown(struct fthd_private *dev_priv) static void isp_free_set_file(struct fthd_private *dev_priv) { - isp_mem_destroy(dev_priv->set_file); + if (dev_priv->set_file) + isp_mem_destroy(dev_priv->set_file); } int isp_powerdown(struct fthd_private *dev_priv) @@ -572,14 +573,17 @@ int fthd_isp_cmd_set_loadfile(struct fthd_private *dev_priv) break; } + if (!filename) { pr_err("no set file for sensorid %04x %04x found\n", dev_priv->sensor_id0, dev_priv->sensor_id1); return -EINVAL; } + + /* The set file is allowed to be missing but we don't get calibration */ ret = request_firmware(&fw, filename, &dev_priv->pdev->dev); if (ret) - return ret; + return 0; /* Firmware memory is preallocated at init time */ BUG_ON(dev_priv->set_file);