summaryrefslogtreecommitdiff
path: root/drivers/media/usb/dvb-usb/dibusb-common.c
diff options
context:
space:
mode:
authorLaurent Caumont <lcaumont2@gmail.com>2017-11-11 12:44:46 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-16 10:33:49 +0100
commita0b99544dde83fa9e53a40c47c5478fefc9c0683 (patch)
treec90de71791a23a9783f918ec4597958b543caa99 /drivers/media/usb/dvb-usb/dibusb-common.c
parent81bf294f5f7b7668576f6857fa7fd67b42e58153 (diff)
media: dvb: i2c transfers over usb cannot be done from stack
commit 6d33377f2abbf9f0e561b116dd468d1c3ff36a6a upstream. Signed-off-by: Laurent Caumont <lcaumont2@gmail.com> Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/usb/dvb-usb/dibusb-common.c')
-rw-r--r--drivers/media/usb/dvb-usb/dibusb-common.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/media/usb/dvb-usb/dibusb-common.c b/drivers/media/usb/dvb-usb/dibusb-common.c
index ef3a8f75f82e..7b15aea2723d 100644
--- a/drivers/media/usb/dvb-usb/dibusb-common.c
+++ b/drivers/media/usb/dvb-usb/dibusb-common.c
@@ -179,8 +179,20 @@ EXPORT_SYMBOL(dibusb_i2c_algo);
int dibusb_read_eeprom_byte(struct dvb_usb_device *d, u8 offs, u8 *val)
{
- u8 wbuf[1] = { offs };
- return dibusb_i2c_msg(d, 0x50, wbuf, 1, val, 1);
+ u8 *buf;
+ int rc;
+
+ buf = kmalloc(2, GFP_KERNEL);
+ if (!buf)
+ return -ENOMEM;
+
+ buf[0] = offs;
+
+ rc = dibusb_i2c_msg(d, 0x50, &buf[0], 1, &buf[1], 1);
+ *val = buf[1];
+ kfree(buf);
+
+ return rc;
}
EXPORT_SYMBOL(dibusb_read_eeprom_byte);