From 57f75bbbf481cba53cd719acb25fa2d7c3ae8736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikl=C3=B3s=20M=C3=A1rton?= Date: Tue, 27 Jul 2021 14:56:59 +0200 Subject: ni845x_spi: Fix signed - unsigned comparisons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I48ef927aa28433fb0e3b3a1f3fb2e797095e53bd Signed-off-by: Miklós Márton Reviewed-on: https://review.coreboot.org/c/flashrom/+/56637 Tested-by: build bot (Jenkins) Reviewed-by: Anastasia Klimchuk --- ni845x_spi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ni845x_spi.c') diff --git a/ni845x_spi.c b/ni845x_spi.c index 253025f0a..d4ae294c1 100644 --- a/ni845x_spi.c +++ b/ni845x_spi.c @@ -185,7 +185,7 @@ static int ni845x_spi_open(const char *serial, uInt32 *return_handle) device_pid = pid; - if (!serial || strtol(serial, NULL, 16) == serial_as_number) + if (!serial || strtoul(serial, NULL, 16) == serial_as_number) break; if (found_devices_count > 1) { @@ -222,7 +222,7 @@ static int usb8452_spi_set_io_voltage(uint16_t requested_io_voltage_mV, uint16_t *set_io_voltage_mV, enum voltage_coerce_mode coerce_mode) { - int i = 0; + unsigned int i = 0; uint8_t selected_voltage_100mV = 0; uint8_t requested_io_voltage_100mV = 0; @@ -552,9 +552,9 @@ static int ni845x_spi_init(const struct programmer_cfg *cfg) // read the cs parameter (which Chip select should we use) CS_str = extract_programmer_param_str(cfg, "cs"); if (CS_str) { - CS_number = CS_str[0] - '0'; + CS_number = strtoul(CS_str, NULL, 10); free(CS_str); - if (strlen(CS_str) > 1 || CS_number < 0 || 7 < CS_number) { + if (CS_number > 7) { msg_perr("Only CS 0-7 supported\n"); return 1; } -- cgit v1.2.3