A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

synaptics_mmi_class: fix firmware file name

Browse source 
Firmware file name was truncated causing update to fail.

Change-Id: Ibccd02705d4778653db1f147ff7a4fe91de95bec
Signed-off-by: Konstantin Makariev <hcv867@motorola.com>
Reviewed-on: https://gerrit.mot.com/1489162
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Konstantin Makariev <kmakariev@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Konstantin Makariev 2020-01-28 08:59:12 -06:00 • committed by Konstantin Makariev
commit 7fff1f29a3
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_fw_update.c
View file

@ -3631,7 +3631,7 @@ exit:
}
#endif
static int synaptics_fw_updater(
static int synaptics_fw_updater_local(
struct synaptics_rmi4_fwu_handle *fwu,
const unsigned char *fw_data)
{
@ -3654,7 +3654,6 @@ static int synaptics_fw_updater(
return retval;
}
//EXPORT_SYMBOL(synaptics_fw_updater);
#ifdef CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_EXTRA_SYSFS_MMI
static ssize_t fwu_sysfs_show_image(struct file *data_file,
@ -3777,10 +3776,10 @@ static int synaptics_dsx_firmware_update(struct device *dev,
}
}
strlcpy(fwu->image_name, fwname, strlen(fwname));
strlcpy(fwu->image_name, fwname, MAX_IMAGE_NAME_LEN);
dev_dbg(dev, "%s: FW filename: %s\n", __func__, fwu->image_name);
retval = synaptics_fw_updater(fwu, fwu->ext_data_source);
retval = synaptics_fw_updater_local(fwu, NULL);
if (retval < 0) {
dev_err(dev, "%s: Failed to do reflash\n", __func__);
goto exit;

2
drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_i2c.c
View file

@ -18,8 +18,6 @@
*/
#define pr_fmt(fmt) "%s: " fmt, __func__
#define DEBUG 511
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>

4
drivers/input/touchscreen/synaptics_mmi_class/synaptics_mmi_class.c
View file

@ -51,7 +51,7 @@ static int synaptics_mmi_get_build_id(struct device *dev, void *cdata) {
rmi = &(ts->rmi4_mod_info);
batohui(&firmware_id, rmi->build_id, sizeof(rmi->build_id));
return scnprintf(TO_CHARP(cdata), TS_MMI_MAX_ID_LEN, "%x\n", firmware_id);
return scnprintf(TO_CHARP(cdata), TS_MMI_MAX_ID_LEN, "%x", firmware_id);
}
static int synaptics_mmi_get_config_id(struct device *dev, void *cdata) {
@ -63,7 +63,7 @@ static int synaptics_mmi_get_config_id(struct device *dev, void *cdata) {
rmi = &(ts->rmi4_mod_info);
batohui(&config_id, rmi->config_id, sizeof(rmi->config_id));
return scnprintf(TO_CHARP(cdata), TS_MMI_MAX_ID_LEN, "%08x\n", config_id);
return scnprintf(TO_CHARP(cdata), TS_MMI_MAX_ID_LEN, "%08x", config_id);
}
static int synaptics_mmi_get_bus_type(struct device *dev, void *idata) {