spi: Merge up old fix