diff options
| author | Angel Pons <th3fanbus@gmail.com> | 2022-09-21 09:45:47 +0200 |
|---|---|---|
| committer | Felix Singer <felixsinger@posteo.net> | 2022-09-21 13:42:45 +0000 |
| commit | 496331a6727d146145f843141e6bc0a1e73b60ff (patch) | |
| tree | 37d22dfcb7a97a37dad938b064b7a77098e55c7c /include | |
| parent | 5363f35fa03e4db2cd79032ca9860c0c5382a355 (diff) | |
| download | flashrom-496331a6727d146145f843141e6bc0a1e73b60ff.tar.gz flashrom-496331a6727d146145f843141e6bc0a1e73b60ff.tar.bz2 flashrom-496331a6727d146145f843141e6bc0a1e73b60ff.zip | |
internal.c: Pass `programmer_cfg` to `try_mtd()`
Programmer params are now passed via the `programmer_cfg` struct, but
the internal programmer did not pass them to the `try_mtd()` function
which was still using `NULL`. This problem resulted in a segmentation
fault when trying to use the internal programmer.
TEST=Make sure internal programmer does not segfault on Haswell ULT.
Change-Id: I9e74bd68a1f9509a201dc518dbff96c27d68a3c3
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/67752
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Thomas Heijligen <src@posteo.de>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/programmer.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/programmer.h b/include/programmer.h index a7cea5e7..17abfd22 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -375,12 +375,15 @@ void exit_conf_mode_ite(uint16_t port); void probe_superio_ite(void); int init_superio_ite(const struct programmer_cfg *cfg); -#if CONFIG_LINUX_MTD == 1 /* trivial wrapper to avoid cluttering internal_init() with #if */ -static inline int try_mtd(void) { return programmer_linux_mtd.init(NULL); }; +static inline int try_mtd(const struct programmer_cfg *cfg) +{ +#if CONFIG_LINUX_MTD == 1 + return programmer_linux_mtd.init(cfg); #else -static inline int try_mtd(void) { return 1; }; + return 1; #endif +} /* mcp6x_spi.c */ int mcp6x_spi_init(int want_spi); |