summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Buesch <m@bues.ch>2021-05-15 22:02:52 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-20 17:17:30 +0300
commitccaf101e780a04a273bddefdd23aa52ace2ad89f (patch)
treec2daef1b9a9a37c8561bad55479b04df6aa4c58d
parentc68d07718b5e23ecdc95298dfe2528af54861626 (diff)
downloadlinux-ccaf101e780a04a273bddefdd23aa52ace2ad89f.tar.xz
ssb: sdio: Don't overwrite const buffer if block_write fails
commit 47ec636f7a25aa2549e198c48ecb6b1c25d05456 upstream. It doesn't make sense to clobber the const driver-side buffer, if a write-to-device attempt failed. All other SSB variants (PCI, PCMCIA and SoC) also don't corrupt the buffer on any failure in block_write. Therefore, remove this memset from the SDIO variant. Signed-off-by: Michael Büsch <m@bues.ch> Cc: stable@vger.kernel.org Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20210515210252.318be2ba@wiggum Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/ssb/sdio.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ssb/sdio.c b/drivers/ssb/sdio.c
index 2278e43614bd..5e10514ef80c 100644
--- a/drivers/ssb/sdio.c
+++ b/drivers/ssb/sdio.c
@@ -411,7 +411,6 @@ static void ssb_sdio_block_write(struct ssb_device *dev, const void *buffer,
sdio_claim_host(bus->host_sdio);
if (unlikely(ssb_sdio_switch_core(bus, dev))) {
error = -EIO;
- memset((void *)buffer, 0xff, count);
goto err_out;
}
offset |= bus->sdio_sbaddr & 0xffff;