Edward O'Callaghan submitted this change.

View Change

Approvals: build bot (Jenkins): Verified David Hendricks: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved
dummyflasher.c: Do not print an error if probing fails

This line gets printed even when not using dummyflasher at all. Drop it.

TEST=Check that no spurious error message appears with ft2232_spi.

Change-Id: I1a81a735db391357d1b6ee6f3e9844255efd0e19
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/46524
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
---
M dummyflasher.c
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/dummyflasher.c b/dummyflasher.c
index 6426ad2..32a00ab 100644
--- a/dummyflasher.c
+++ b/dummyflasher.c
@@ -1029,13 +1029,9 @@
{
unsigned int i;
const struct emu_data *emu_data = get_data_from_context(flash);
- if (!emu_data) {
- msg_perr("No data in flash context!\n");
- return 0;
- }

/* Skip the probing if we don't emulate this chip. */
- if (emu_data->emu_chip != EMULATE_VARIABLE_SIZE)
+ if (!emu_data || emu_data->emu_chip != EMULATE_VARIABLE_SIZE)
return 0;

/*

To view, visit change 46524. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I1a81a735db391357d1b6ee6f3e9844255efd0e19
Gerrit-Change-Number: 46524
Gerrit-PatchSet: 3
Gerrit-Owner: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: David Hendricks <david.hendricks@gmail.com>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-MessageType: merged