Commit 3920631c authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab
Browse files

[media] iguanair: do not modify transmit buffer 



Since commit "[media] rc-core: move timeout and checks to lirc", the
incoming buffer is used after the driver transmits.

Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent aa740e0a

drivers/media/rc/iguanair.c

+21 −30
Original line number Diff line number Diff line
@@ -334,31 +334,38 @@ static int iguanair_set_tx_mask(struct rc_dev *dev, uint32_t mask) 
static int iguanair_tx(struct rc_dev *dev, unsigned *txbuf, unsigned count)

{

	struct iguanair *ir = dev->priv;

	uint8_t space, *payload;

	unsigned i, size, rc, bytes;

	uint8_t space;

	unsigned i, size, periods, bytes;

	int rc;

	struct send_packet *packet;



	mutex_lock(&ir->lock);



	packet = kmalloc(sizeof(*packet) + ir->bufsize, GFP_KERNEL);

	if (!packet) {

		rc = -ENOMEM;

		goto out;

	}



	/* convert from us to carrier periods */

	for (i = size = 0; i < count; i++) {

		txbuf[i] = DIV_ROUND_CLOSEST(txbuf[i] * ir->carrier, 1000000);

		bytes = (txbuf[i] + 126) / 127;

	for (i = space = size = 0; i < count; i++) {

		periods = DIV_ROUND_CLOSEST(txbuf[i] * ir->carrier, 1000000);

		bytes = DIV_ROUND_UP(periods, 127);

		if (size + bytes > ir->bufsize) {

			count = i;

			break;

		}

		size += bytes;

		while (periods > 127) {

			packet->payload[size++] = 127 | space;

			periods -= 127;

		}



	if (count == 0) {

		rc = -EINVAL;

		goto out;

		packet->payload[size++] = periods | space;

		space ^= 0x80;

	}



	packet = kmalloc(sizeof(*packet) + size, GFP_KERNEL);

	if (!packet) {

		rc = -ENOMEM;

	if (count == 0) {

		rc = -EINVAL;

		goto out;

	}
@@ -370,26 +377,11 @@ static int iguanair_tx(struct rc_dev *dev, unsigned *txbuf, unsigned count) 
	packet->busy7 = ir->busy7;

	packet->busy4 = ir->busy4;



	space = 0;

	payload = packet->payload;



	for (i = 0; i < count; i++) {

		unsigned periods = txbuf[i];



		while (periods > 127) {

			*payload++ = 127 | space;

			periods -= 127;

		}



		*payload++ = periods | space;

		space ^= 0x80;

	}



	if (ir->receiver_on) {

		rc = iguanair_receiver(ir, false);

		if (rc) {

			dev_warn(ir->dev, "disable receiver before transmit failed\n");

			goto out_kfree;

			goto out;

		}

	}
@@ -405,9 +397,8 @@ static int iguanair_tx(struct rc_dev *dev, unsigned *txbuf, unsigned count) 
			dev_warn(ir->dev, "re-enable receiver after transmit failed\n");

	}



out_kfree:

	kfree(packet);

out:

	kfree(packet);

	mutex_unlock(&ir->lock);



	return rc ? rc : count;