summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Wolf <linux@wolf-entwicklungen.de>2017-12-18 19:27:58 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-19 15:55:07 +0100
commitda3761feaec3cfc4f247b6cb9e366b8d40b3c356 (patch)
tree91580902b0e98fdd52b3891e46e26600e68794af
parent893b103a3e9ce255e9afe8103d90f28ac2124eb8 (diff)
downloadlinux-stable-da3761feaec3cfc4f247b6cb9e366b8d40b3c356.tar.gz
linux-stable-da3761feaec3cfc4f247b6cb9e366b8d40b3c356.tar.bz2
linux-stable-da3761feaec3cfc4f247b6cb9e366b8d40b3c356.zip
Staging: Pi433: Bugfix for wrong argument for sizeof() in TX thread
sizeof(array) != sizeof(pointer to array) Fixes: "staging: pi433: reduce stack size in tx thread" Fixes: 62f39d49d168 ("staging: pi433: reduce stack size in tx thread") Signed-off-by: Marcus Wolf <linux@wolf-entwicklungen.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/pi433/pi433_if.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index b4e6094ad553..4752056cdbe3 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -560,7 +560,6 @@ pi433_tx_thread(void *data)
struct pi433_device *device = data;
struct spi_device *spi = device->spi;
struct pi433_tx_cfg tx_cfg;
- u8 *buffer = device->buffer;
size_t size;
bool rx_interrupted = false;
int position, repetitions;
@@ -609,19 +608,19 @@ pi433_tx_thread(void *data)
size++;
/* prime buffer */
- memset(buffer, 0, size);
+ memset(device->buffer, 0, size);
position = 0;
/* add length byte, if requested */
if (tx_cfg.enable_length_byte == OPTION_ON)
- buffer[position++] = size - 1; /* according to spec length byte itself must be excluded from the length calculation */
+ device->buffer[position++] = size - 1; /* according to spec length byte itself must be excluded from the length calculation */
/* add adr byte, if requested */
if (tx_cfg.enable_address_byte == OPTION_ON)
- buffer[position++] = tx_cfg.address_byte;
+ device->buffer[position++] = tx_cfg.address_byte;
/* finally get message data from fifo */
- retval = kfifo_out(&device->tx_fifo, &buffer[position], sizeof(buffer) - position);
+ retval = kfifo_out(&device->tx_fifo, &device->buffer[position], sizeof(device->buffer) - position);
dev_dbg(device->dev, "read %d message byte(s) from fifo queue.", retval);
mutex_unlock(&device->tx_fifo_lock);
@@ -703,7 +702,7 @@ pi433_tx_thread(void *data)
int temp = device->free_in_fifo;
device->free_in_fifo = 0;
rf69_write_fifo(spi,
- &buffer[position],
+ &device->buffer[position],
temp);
position += temp;
} else {
@@ -711,7 +710,7 @@ pi433_tx_thread(void *data)
device->free_in_fifo -= size;
repetitions--;
rf69_write_fifo(spi,
- &buffer[position],
+ &device->buffer[position],
(size - position));
position = 0; /* reset for next repetition */
}