Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9c85ee6 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] siano: make it work again with CONFIG_VMAP_STACK 

Reported as a Kaffeine bug:
	https://bugs.kde.org/show_bug.cgi?id=375811



The USB control messages require DMA to work. We cannot pass
a stack-allocated buffer, as it is not warranted that the
stack would be into a DMA enabled area.

On Kernel 4.9, the default is to not accept DMA on stack anymore
on x86 architecture. On other architectures, this has been a
requirement since Kernel 2.2. So, after this patch, this driver
should likely work fine on all archs.

Tested with USB ID 2040:5510: Hauppauge Windham

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 42980da2

drivers/media/usb/siano/smsusb.c

+13 −5
Original line number Original line Diff line number Diff line
@@ -218,22 +218,30 @@ static int smsusb_start_streaming(struct smsusb_device_t *dev) 
static int smsusb_sendrequest(void *context, void *buffer, size_t size)

static int smsusb_sendrequest(void *context, void *buffer, size_t size)

{

{

	struct smsusb_device_t *dev = (struct smsusb_device_t *) context;

	struct smsusb_device_t *dev = (struct smsusb_device_t *) context;

	struct sms_msg_hdr *phdr = (struct sms_msg_hdr *) buffer;

	struct sms_msg_hdr *phdr;

	int dummy;

	int dummy, ret;





	if (dev->state != SMSUSB_ACTIVE) {

	if (dev->state != SMSUSB_ACTIVE) {

		pr_debug("Device not active yet\n");

		pr_debug("Device not active yet\n");

		return -ENOENT;

		return -ENOENT;

	}

	}





	phdr = kmalloc(size, GFP_KERNEL);

	if (!phdr)

		return -ENOMEM;

	memcpy(phdr, buffer, size);



	pr_debug("sending %s(%d) size: %d\n",

	pr_debug("sending %s(%d) size: %d\n",

		  smscore_translate_msg(phdr->msg_type), phdr->msg_type,

		  smscore_translate_msg(phdr->msg_type), phdr->msg_type,

		  phdr->msg_length);

		  phdr->msg_length);





	smsendian_handle_tx_message((struct sms_msg_data *) phdr);

	smsendian_handle_tx_message((struct sms_msg_data *) phdr);

	smsendian_handle_message_header((struct sms_msg_hdr *)buffer);

	smsendian_handle_message_header((struct sms_msg_hdr *)phdr);

	return usb_bulk_msg(dev->udev, usb_sndbulkpipe(dev->udev, 2),

	ret = usb_bulk_msg(dev->udev, usb_sndbulkpipe(dev->udev, 2),

			    buffer, size, &dummy, 1000);

			    phdr, size, &dummy, 1000);



	kfree(phdr);

	return ret;

}

}





static char *smsusb1_fw_lkup[] = {

static char *smsusb1_fw_lkup[] = {