lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] friio: get rid of on-stack dma buffers

Browse Source 
usb_control_msg initiates (and waits for completion of) a dma transfer using
the supplied buffer. That buffer thus has to be seperately allocated on
the heap.

In lib/dma_debug.c the function check_for_stack even warns about it:
	WARNING: at lib/dma-debug.c:866 check_for_stack

Note: This change is tested to compile only, as I don't have the hardware.

Signed-off-by: Florian Mickler <florian@mickler.org>
Cc: Akihiro Tsukada <tskd2@yahoo.co.jp>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Florian Mickler
2011-03-21 15:33:43 -03:00
committed by Mauro Carvalho Chehab
parent ab22cbda66
commit 0e4e7208e6
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/media/dvb/dvb-usb/friio.c
View File

@@ -142,17 +142,20 @@ static u32 gl861_i2c_func(struct i2c_adapter *adapter)
return I2C_FUNC_I2C; return I2C_FUNC_I2C;
} }
static int friio_ext_ctl(struct dvb_usb_adapter *adap, static int friio_ext_ctl(struct dvb_usb_adapter *adap,
u32 sat_color, int lnb_on) u32 sat_color, int lnb_on)
{ {
int i; int i;
int ret; int ret;
struct i2c_msg msg; struct i2c_msg msg;
u8 buf[2]; u8 *buf;
u32 mask; u32 mask;
u8 lnb = (lnb_on) ? FRIIO_CTL_LNB : 0; u8 lnb = (lnb_on) ? FRIIO_CTL_LNB : 0;
buf = kmalloc(2, GFP_KERNEL);
if (!buf)
return -ENOMEM;
msg.addr = 0x00; msg.addr = 0x00;
msg.flags = 0; msg.flags = 0;
msg.len = 2; msg.len = 2;
@@ -189,6 +192,7 @@ static int friio_ext_ctl(struct dvb_usb_adapter *adap,
buf[1] |= FRIIO_CTL_CLK; buf[1] |= FRIIO_CTL_CLK;
ret += gl861_i2c_xfer(&adap->dev->i2c_adap, &msg, 1); ret += gl861_i2c_xfer(&adap->dev->i2c_adap, &msg, 1);
kfree(buf);
return (ret == 70); return (ret == 70);
} }
@@ -219,11 +223,20 @@ static int friio_initialize(struct dvb_usb_device *d)
int ret; int ret;
int i; int i;
int retry = 0; int retry = 0;
u8 rbuf[2]; u8 *rbuf, *wbuf;
u8 wbuf[3];
deb_info("%s called.\n", __func__); deb_info("%s called.\n", __func__);
wbuf = kmalloc(3, GFP_KERNEL);
if (!wbuf)
return -ENOMEM;
rbuf = kmalloc(2, GFP_KERNEL);
if (!rbuf) {
kfree(wbuf);
return -ENOMEM;
}
/* use gl861_i2c_msg instead of gl861_i2c_xfer(), */ /* use gl861_i2c_msg instead of gl861_i2c_xfer(), */
/* because the i2c device is not set up yet. */ /* because the i2c device is not set up yet. */
wbuf[0] = 0x11; wbuf[0] = 0x11;
@@ -358,6 +371,8 @@ restart:
return 0; return 0;
error: error:
kfree(wbuf);
kfree(rbuf);
deb_info("%s:ret == %d\n", __func__, ret); deb_info("%s:ret == %d\n", __func__, ret);
return -EIO; return -EIO;
} }