dany/facetimehd
1
0
Fork 0
mirror of https://github.com/patjak/facetimehd.git synced 2026-04-09 19:10:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

facetimehd: Allow loading of set file to fail

Browse Source 
Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
This commit is contained in:
Patrik Jakobsson
2015-12-06 14:45:38 +01:00
parent abdb6cd603
commit eb3e43505d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fthd_isp.c
View File

@@ -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) 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) int isp_powerdown(struct fthd_private *dev_priv)
@@ -572,14 +573,17 @@ int fthd_isp_cmd_set_loadfile(struct fthd_private *dev_priv)
break; break;
} }
if (!filename) { if (!filename) {
pr_err("no set file for sensorid %04x %04x found\n", pr_err("no set file for sensorid %04x %04x found\n",
dev_priv->sensor_id0, dev_priv->sensor_id1); dev_priv->sensor_id0, dev_priv->sensor_id1);
return -EINVAL; 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); ret = request_firmware(&fw, filename, &dev_priv->pdev->dev);
if (ret) if (ret)
return ret; return 0;
/* Firmware memory is preallocated at init time */ /* Firmware memory is preallocated at init time */
BUG_ON(dev_priv->set_file); BUG_ON(dev_priv->set_file);