]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] lmedm04: get rid of on-stack dma buffers
authorFlorian Mickler <florian@mickler.org>
Sun, 20 Mar 2011 21:50:52 +0000 (18:50 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 20 May 2011 12:28:19 +0000 (09:28 -0300)
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

Tested-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Florian Mickler <florian@mickler.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/dvb-usb/lmedm04.c

index b47ec3055ff794764f2d2fc710b59c966ac8d621..a4457e4c1246287b08471263e06388cbf4dd1dc3 100644 (file)
@@ -329,13 +329,19 @@ static int lme2510_int_read(struct dvb_usb_adapter *adap)
 static int lme2510_return_status(struct usb_device *dev)
 {
        int ret = 0;
-       u8 data[10] = {0};
+       u8 *data;
+
+       data = kzalloc(10, GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
 
        ret |= usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
                        0x06, 0x80, 0x0302, 0x00, data, 0x0006, 200);
        info("Firmware Status: %x (%x)", ret , data[2]);
 
-       return (ret < 0) ? -ENODEV : data[2];
+       ret = (ret < 0) ? -ENODEV : data[2];
+       kfree(data);
+       return ret;
 }
 
 static int lme2510_msg(struct dvb_usb_device *d,
@@ -655,7 +661,7 @@ static int lme2510_download_firmware(struct usb_device *dev,
                                        const struct firmware *fw)
 {
        int ret = 0;
-       u8 data[512] = {0};
+       u8 *data;
        u16 j, wlen, len_in, start, end;
        u8 packet_size, dlen, i;
        u8 *fw_data;
@@ -663,6 +669,11 @@ static int lme2510_download_firmware(struct usb_device *dev,
        packet_size = 0x31;
        len_in = 1;
 
+       data = kzalloc(512, GFP_KERNEL);
+       if (!data) {
+               info("FRM Could not start Firmware Download (Buffer allocation failed)");
+               return -ENOMEM;
+       }
 
        info("FRM Starting Firmware Download");
 
@@ -706,7 +717,7 @@ static int lme2510_download_firmware(struct usb_device *dev,
        else
                info("FRM Firmware Download Completed - Resetting Device");
 
-
+       kfree(data);
        return (ret < 0) ? -ENODEV : 0;
 }