Merge branch 'master' of git://git.denx.de/u-boot-usb

[karo-tx-uboot.git] / drivers / spi / spi-uclass.c

diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index 64eb1f6b36980f76829675f520d923ea0d2d8b44..7a57bceb260f1c3e79fc9ed4d735f1b27c45160b 100644 (file)
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -57,7 +57,7 @@ int spi_claim_bus(struct spi_slave *slave)
        speed = slave->max_hz;
        if (spi->max_hz) {
                if (speed)
-                       speed = min(speed, spi->max_hz);
+                       speed = min(speed, (int)spi->max_hz);
                else
                        speed = spi->max_hz;
        }