diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2022-01-18 10:45:32 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-01-19 18:14:02 +0100 |
commit | 4f5a884fc212d99654e4fb36ba98d5354f0dd18e (patch) | |
tree | f4ac26f5acd43be75cb9d3b2f89fa92c40dbc8ee /drivers/spi/spi-armada-3700.c | |
parent | KVM: avoid warning on s390 in mark_page_dirty (diff) | |
parent | KVM: VMX: switch blocked_vcpu_on_cpu_lock to raw spinlock (diff) | |
download | linux-4f5a884fc212d99654e4fb36ba98d5354f0dd18e.tar.xz linux-4f5a884fc212d99654e4fb36ba98d5354f0dd18e.zip |
Merge branch 'kvm-pi-raw-spinlock' into HEAD
Bring in fix for VT-d posted interrupts before further changing the code in 5.17.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'drivers/spi/spi-armada-3700.c')
-rw-r--r-- | drivers/spi/spi-armada-3700.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-armada-3700.c b/drivers/spi/spi-armada-3700.c index 46feafe4e201..d8cc4b270644 100644 --- a/drivers/spi/spi-armada-3700.c +++ b/drivers/spi/spi-armada-3700.c @@ -901,7 +901,7 @@ static int a3700_spi_probe(struct platform_device *pdev) return 0; error_clk: - clk_disable_unprepare(spi->clk); + clk_unprepare(spi->clk); error: spi_master_put(master); out: |