diff options
| author | uwe <uwe@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2011-09-07 20:48:34 +0000 |
|---|---|---|
| committer | uwe <uwe@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2011-09-07 20:48:34 +0000 |
| commit | 767f965c5ec27b848c81e6ccb63dd273203ea47d (patch) | |
| tree | fbf124b135182c52b2fe9bc0446560a7ae2509d1 /linux_spi.c | |
| parent | 4a71f3f0a5db7089a3ea2df26040d5df2fa62231 (diff) | |
| download | flashrom-767f965c5ec27b848c81e6ccb63dd273203ea47d.tar.gz | |
Small fixes for the linux_spi programmer code.
Signed-off-by: Sven Schnelle <svens@stackframe.org>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1432 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'linux_spi.c')
| -rw-r--r-- | linux_spi.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/linux_spi.c b/linux_spi.c index d120754..de82def 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -54,7 +54,7 @@ static const struct spi_programmer spi_programmer_linux = { int linux_spi_init(void) { char *p, *endp, *dev; - int speed = 0; + uint32_t speed = 0; dev = extract_programmer_param("dev"); if (!dev || !strlen(dev)) { @@ -65,24 +65,29 @@ int linux_spi_init(void) p = extract_programmer_param("speed"); if (p && strlen(p)) { - speed = strtoul(p, &endp, 10) * 1024; + speed = (uint32_t)strtoul(p, &endp, 10) * 1024; if (p == endp) { msg_perr("%s: invalid clock: %s kHz\n", __func__, p); return 1; } } + msg_pdbg("Using device %s\n", dev); if ((fd = open(dev, O_RDWR)) == -1) { msg_perr("%s: failed to open %s: %s\n", __func__, dev, strerror(errno)); return 1; } - if (speed > 0 && ioctl(fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed) == -1) { - msg_perr("%s: failed to set speed %dHz: %s\n", - __func__, speed, strerror(errno)); - close(fd); - return 1; + if (speed > 0) { + if (ioctl(fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed) == -1) { + msg_perr("%s: failed to set speed %dHz: %s\n", + __func__, speed, strerror(errno)); + close(fd); + return 1; + } + + msg_pdbg("Using %d kHz clock\n", speed); } if (register_shutdown(linux_spi_shutdown, NULL)) |