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

fthd/isp: Don't return fatal error on missing sensor setfile

Browse Source 
Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
This commit is contained in:
Patrik Jakobsson
2017-04-24 06:51:13 +02:00
parent 8fca2ed27d
commit 758fe01952
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fthd_isp.c
View File

@@ -530,8 +530,6 @@ int fthd_isp_cmd_set_loadfile(struct fthd_private *dev_priv)
vendor = dmi_get_system_info(DMI_BOARD_VENDOR); vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
board = dmi_get_system_info(DMI_BOARD_NAME); board = dmi_get_system_info(DMI_BOARD_NAME);
memset(&cmd, 0, sizeof(cmd));
switch(dev_priv->sensor_id1) { switch(dev_priv->sensor_id1) {
case 0x164: case 0x164:
filename = "facetimehd/8221_01XX.dat"; filename = "facetimehd/8221_01XX.dat";
@@ -572,15 +570,13 @@ int fthd_isp_cmd_set_loadfile(struct fthd_private *dev_priv)
} }
break; break;
default: default:
pr_debug("Unknown sensor id: %04x %04x\n", dev_priv->sensor_id0,
dev_priv->sensor_id1);
break; break;
} }
if (!filename) { if (!filename)
pr_err("no set file for sensorid %04x %04x found\n", return 0;
dev_priv->sensor_id0, dev_priv->sensor_id1);
return -EINVAL;
}
/* The set file is allowed to be missing but we don't get calibration */ /* 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);
@@ -597,8 +593,11 @@ int fthd_isp_cmd_set_loadfile(struct fthd_private *dev_priv)
dev_priv->set_file = file; dev_priv->set_file = file;
pr_debug("set file: addr %08lx, size %d\n", file->offset, (int)file->size); pr_debug("set file: addr %08lx, size %d\n", file->offset, (int)file->size);
memset(&cmd, 0, sizeof(cmd));
cmd.addr = file->offset; cmd.addr = file->offset;
cmd.length = file->size; cmd.length = file->size;
return fthd_isp_cmd(dev_priv, CISP_CMD_CH_SET_FILE_LOAD, &cmd, sizeof(cmd), NULL); return fthd_isp_cmd(dev_priv, CISP_CMD_CH_SET_FILE_LOAD, &cmd, sizeof(cmd), NULL);
} }