diff --git a/plugins/wacom-usb/fu-wac-module-bluetooth-id6.c b/plugins/wacom-usb/fu-wac-module-bluetooth-id6.c index 84a8a315a..dd0bb9c37 100644 --- a/plugins/wacom-usb/fu-wac-module-bluetooth-id6.c +++ b/plugins/wacom-usb/fu-wac-module-bluetooth-id6.c @@ -111,14 +111,18 @@ fu_wac_module_bluetooth_id6_write_firmware(FuDevice *device, /* get default image */ fw = fu_firmware_get_bytes(firmware, error); - if (fw == NULL) + if (fw == NULL) { + g_prefix_error(error, "wacom bluetooth-id6 module failed to get bytes: "); return FALSE; + } /* build each data packet */ data = g_bytes_get_data(fw, &len); blocks = fu_wac_module_bluetooth_id6_parse_blocks(data, len, error); - if (blocks == NULL) + if (blocks == NULL) { + g_prefix_error(error, "wacom bluetooth-id6 module failed to parse blocks: "); return FALSE; + } /* start, which will erase the module */ if (!fu_wac_module_set_feature(self, @@ -126,8 +130,10 @@ fu_wac_module_bluetooth_id6_write_firmware(FuDevice *device, blob_start, fu_progress_get_child(progress), FU_WAC_MODULE_ERASE_TIMEOUT, - error)) + error)) { + g_prefix_error(error, "wacom bluetooth-id6 module failed to erase: "); return FALSE; + } fu_progress_step_done(progress); /* data */ @@ -148,8 +154,10 @@ fu_wac_module_bluetooth_id6_write_firmware(FuDevice *device, blob_chunk, fu_progress_get_child(progress), FU_WAC_MODULE_WRITE_TIMEOUT, - error)) + error)) { + g_prefix_error(error, "wacom bluetooth-id6 module failed to write: "); return FALSE; + } /* update progress */ fu_progress_set_percentage_full(fu_progress_get_child(progress), @@ -164,8 +172,10 @@ fu_wac_module_bluetooth_id6_write_firmware(FuDevice *device, NULL, fu_progress_get_child(progress), FU_WAC_MODULE_COMMIT_TIMEOUT, - error)) + error)) { + g_prefix_error(error, "wacom bluetooth-id6 module failed to end: "); return FALSE; + } fu_progress_step_done(progress); /* success */ diff --git a/plugins/wacom-usb/fu-wac-module-bluetooth.c b/plugins/wacom-usb/fu-wac-module-bluetooth.c index d839d1292..3f3fb3741 100644 --- a/plugins/wacom-usb/fu-wac-module-bluetooth.c +++ b/plugins/wacom-usb/fu-wac-module-bluetooth.c @@ -136,14 +136,18 @@ fu_wac_module_bluetooth_write_firmware(FuDevice *device, /* get default image */ fw = fu_firmware_get_bytes(firmware, error); - if (fw == NULL) + if (fw == NULL) { + g_prefix_error(error, "wacom bluetooth module failed to get bytes: "); return FALSE; + } /* build each data packet */ data = g_bytes_get_data(fw, &len); blocks = fu_wac_module_bluetooth_parse_blocks(data, len, TRUE, error); - if (blocks == NULL) + if (blocks == NULL) { + g_prefix_error(error, "wacom bluetooth module failed to parse: "); return FALSE; + } /* start, which will erase the module */ if (!fu_wac_module_set_feature(self, @@ -151,8 +155,10 @@ fu_wac_module_bluetooth_write_firmware(FuDevice *device, blob_start, fu_progress_get_child(progress), FU_WAC_MODULE_ERASE_TIMEOUT, - error)) + error)) { + g_prefix_error(error, "wacom bluetooth module failed to erase: "); return FALSE; + } fu_progress_step_done(progress); /* data */ @@ -173,8 +179,10 @@ fu_wac_module_bluetooth_write_firmware(FuDevice *device, blob_chunk, fu_progress_get_child(progress), FU_WAC_MODULE_WRITE_TIMEOUT, - error)) + error)) { + g_prefix_error(error, "wacom bluetooth module failed to write: "); return FALSE; + } /* update progress */ fu_progress_set_percentage_full(fu_progress_get_child(progress), @@ -189,8 +197,10 @@ fu_wac_module_bluetooth_write_firmware(FuDevice *device, NULL, fu_progress_get_child(progress), FU_WAC_MODULE_FINISH_TIMEOUT, - error)) + error)) { + g_prefix_error(error, "wacom bluetooth module failed to end: "); return FALSE; + } fu_progress_step_done(progress); /* success */ diff --git a/plugins/wacom-usb/fu-wac-module-scaler.c b/plugins/wacom-usb/fu-wac-module-scaler.c index a65cfbf7b..bd953507d 100644 --- a/plugins/wacom-usb/fu-wac-module-scaler.c +++ b/plugins/wacom-usb/fu-wac-module-scaler.c @@ -84,14 +84,18 @@ fu_wac_module_scaler_write_firmware(FuDevice *device, /* get default image */ fw = fu_firmware_get_bytes(firmware, error); - if (fw == NULL) + if (fw == NULL) { + g_prefix_error(error, "wacom scaler module failed to get bytes: "); return FALSE; + } /* build each data packet */ data = g_bytes_get_data(fw, &len); blocks = fu_wac_module_scaler_parse_blocks(data, len, error); - if (blocks == NULL) + if (blocks == NULL) { + g_prefix_error(error, "wacom scaler module failed to parse blocks: "); return FALSE; + } /* start, which will erase the module */ if (!fu_wac_module_set_feature(self, @@ -99,8 +103,10 @@ fu_wac_module_scaler_write_firmware(FuDevice *device, blob_start, fu_progress_get_child(progress), FU_WAC_MODULE_ERASE_TIMEOUT, - error)) + error)) { + g_prefix_error(error, "wacom scaler module failed to erase: "); return FALSE; + } fu_progress_step_done(progress); @@ -122,8 +128,10 @@ fu_wac_module_scaler_write_firmware(FuDevice *device, blob_chunk, fu_progress_get_child(progress), FU_WAC_MODULE_WRITE_TIMEOUT, - error)) + error)) { + g_prefix_error(error, "wacom scaler module failed to write: "); return FALSE; + } /* update progress */ fu_progress_set_percentage_full(fu_progress_get_child(progress), i + 1, @@ -137,8 +145,10 @@ fu_wac_module_scaler_write_firmware(FuDevice *device, NULL, fu_progress_get_child(progress), FU_WAC_MODULE_COMMIT_TIMEOUT, - error)) + error)) { + g_prefix_error(error, "wacom scaler module failed to end: "); return FALSE; + } fu_progress_step_done(progress); /* success */ diff --git a/plugins/wacom-usb/fu-wac-module-touch.c b/plugins/wacom-usb/fu-wac-module-touch.c index 47b9964b5..a49449e93 100644 --- a/plugins/wacom-usb/fu-wac-module-touch.c +++ b/plugins/wacom-usb/fu-wac-module-touch.c @@ -41,8 +41,10 @@ fu_wac_module_touch_write_firmware(FuDevice *device, /* build each data packet */ fw = fu_firmware_get_bytes(firmware, error); - if (fw == NULL) + if (fw == NULL) { + g_prefix_error(error, "wacom touch module failed to get bytes: "); return FALSE; + } chunks = fu_chunk_array_new_from_bytes(fw, fu_firmware_get_addr(firmware), 0x0, /* page_sz */ @@ -54,8 +56,10 @@ fu_wac_module_touch_write_firmware(FuDevice *device, NULL, fu_progress_get_child(progress), FU_WAC_MODULE_ERASE_TIMEOUT, - error)) + error)) { + g_prefix_error(error, "wacom touch module failed to erase: "); return FALSE; + } fu_progress_step_done(progress); /* data */ @@ -77,8 +81,10 @@ fu_wac_module_touch_write_firmware(FuDevice *device, fu_chunk_get_data_sz(chk), 0x0, /* src */ fu_chunk_get_data_sz(chk), - error)) + error)) { + g_prefix_error(error, "wacom touch module failed to memcpy: "); return FALSE; + } blob_chunk = g_bytes_new(buf, sizeof(buf)); if (!fu_wac_module_set_feature(self, FU_WAC_MODULE_COMMAND_DATA, @@ -103,8 +109,10 @@ fu_wac_module_touch_write_firmware(FuDevice *device, NULL, fu_progress_get_child(progress), FU_WAC_MODULE_FINISH_TIMEOUT, - error)) + error)) { + g_prefix_error(error, "wacom touch module failed to end: "); return FALSE; + } fu_progress_step_done(progress); /* success */