diff options
Diffstat (limited to 'samsung-ipc/device')
| -rw-r--r-- | samsung-ipc/device/aries/aries_ipc.c | 6 | ||||
| -rw-r--r-- | samsung-ipc/device/crespo/crespo_ipc.c | 6 | ||||
| -rw-r--r-- | samsung-ipc/device/galaxys2/galaxys2_loader.c | 7 | ||||
| -rw-r--r-- | samsung-ipc/device/maguro/maguro_loader.c | 7 |
4 files changed, 18 insertions, 8 deletions
diff --git a/samsung-ipc/device/aries/aries_ipc.c b/samsung-ipc/device/aries/aries_ipc.c index 64b85bd..3e60134 100644 --- a/samsung-ipc/device/aries/aries_ipc.c +++ b/samsung-ipc/device/aries/aries_ipc.c @@ -348,10 +348,12 @@ int aries_modem_bootstrap(struct ipc_client *client) /* nv_data part. */ /* Check if all the nv_data files are ok. */ - nv_data_check(client); + if (nv_data_check(client) < 0) + goto error; /* Check if the MD5 is ok. */ - nv_data_md5_check(client); + if (nv_data_md5_check(client) < 0) + goto error; /* Write nv_data.bin to modem_ctl. */ ipc_client_log(client, "aries_ipc_bootstrap: write nv_data to onedram"); diff --git a/samsung-ipc/device/crespo/crespo_ipc.c b/samsung-ipc/device/crespo/crespo_ipc.c index 31e2dca..576fd92 100644 --- a/samsung-ipc/device/crespo/crespo_ipc.c +++ b/samsung-ipc/device/crespo/crespo_ipc.c @@ -283,10 +283,12 @@ int crespo_modem_bootstrap(struct ipc_client *client) /* nv_data part. */ /* Check if all the nv_data files are ok. */ - nv_data_check(client); + if (nv_data_check(client) < 0) + goto error; /* Check if the MD5 is ok. */ - nv_data_md5_check(client); + if (nv_data_md5_check(client) < 0) + goto error; /* Write nv_data.bin to modem_ctl. */ ipc_client_log(client, "crespo_ipc_bootstrap: write nv_data to modem_ctl"); diff --git a/samsung-ipc/device/galaxys2/galaxys2_loader.c b/samsung-ipc/device/galaxys2/galaxys2_loader.c index 575a4db..4647cac 100644 --- a/samsung-ipc/device/galaxys2/galaxys2_loader.c +++ b/samsung-ipc/device/galaxys2/galaxys2_loader.c @@ -435,8 +435,11 @@ static int galaxys2_send_secure_images(struct ipc_client *client, ipc_client_log(client, "sent FIRMWARE image"); } - nv_data_check(client); - nv_data_md5_check(client); + if (nv_data_check(client) < 0) + goto fail; + + if (nv_data_md5_check(client) < 0) + goto fail; nv_data = ipc_client_file_read(client, nv_data_path(client), 2 << 20, 1024); if (nv_data == NULL) { diff --git a/samsung-ipc/device/maguro/maguro_loader.c b/samsung-ipc/device/maguro/maguro_loader.c index 717c949..82c1972 100644 --- a/samsung-ipc/device/maguro/maguro_loader.c +++ b/samsung-ipc/device/maguro/maguro_loader.c @@ -535,8 +535,11 @@ static int maguro_send_image_addrs(struct ipc_client *client, ipc_client_log(client, "sent FIRMWARE image"); } - nv_data_check(client); - nv_data_md5_check(client); + if (nv_data_check(client) < 0) + goto fail; + + if (nv_data_md5_check(client) < 0) + goto fail; nv_data = ipc_client_file_read(client, nv_data_path(client), 2 << 20, 1024); if (nv_data == NULL) { |