| Message ID | 20220830093607.45484-1-shreeya.patel@collabora.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9477420efc41f60f06413cefa38f5bfd71ba64d8 |
| Headers | show |
| Series | spi: amd: Fix speed selection | expand |
On Tue, 30 Aug 2022 15:06:07 +0530, Shreeya Patel wrote: > If the current speed is equal to the requested speed by the device > then return success. > This patch fixes a bug introduced by the commit 3fe26121dc3a > ("spi: amd: Configure device speed") which checks speed_hz instead > of amd_spi->speed_hz. > > > [...] Applied to broonie/spi.git for-next Thanks! [1/1] spi: amd: Fix speed selection commit: 9477420efc41f60f06413cefa38f5bfd71ba64d8 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/drivers/spi/spi-amd.c b/drivers/spi/spi-amd.c index 264633c5ce0b..e23121456c70 100644 --- a/drivers/spi/spi-amd.c +++ b/drivers/spi/spi-amd.c @@ -240,9 +240,6 @@ static int amd_set_spi_freq(struct amd_spi *amd_spi, u32 speed_hz) { unsigned int i, spd7_val, alt_spd; - if (speed_hz == amd_spi->speed_hz) - return 0; - if (speed_hz < AMD_SPI_MIN_HZ) return -EINVAL; @@ -250,7 +247,7 @@ static int amd_set_spi_freq(struct amd_spi *amd_spi, u32 speed_hz) if (speed_hz >= amd_spi_freq[i].speed_hz) break; - if (speed_hz == amd_spi_freq[i].speed_hz) + if (amd_spi->speed_hz == amd_spi_freq[i].speed_hz) return 0; amd_spi->speed_hz = amd_spi_freq[i].speed_hz;
If the current speed is equal to the requested speed by the device then return success. This patch fixes a bug introduced by the commit 3fe26121dc3a ("spi: amd: Configure device speed") which checks speed_hz instead of amd_spi->speed_hz. Fixes: 3fe26121dc3a ("spi: amd: Configure device speed") Signed-off-by: Shreeya Patel <shreeya.patel@collabora.com> --- drivers/spi/spi-amd.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)