From 607cb24580b355be472402473b2a6d6285519870 Mon Sep 17 00:00:00 2001 From: Thomas Meyer Date: Sat, 13 Aug 2011 11:31:48 +0200 Subject: [PATCH] --- yaml --- r: 267617 b: refs/heads/master c: 528959aa08265d1e6b90aaf3767d45b9b57f041b h: refs/heads/master i: 267615: 5694dc363e9a6636a00a954e0d06a5226f65dd04 v: v3 --- [refs] | 2 +- trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a891d2158a1a..15d3cfb8ba30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b608983fe9cbb522e6dd819ea357a3af89f2e8e +refs/heads/master: 528959aa08265d1e6b90aaf3767d45b9b57f041b diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c index 3f303ea14337..aaf44c359827 100644 --- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c @@ -485,7 +485,7 @@ void card_send_command(struct ft1000_device *ft1000dev, void *ptempbuffer, DEBUG("card_send_command: enter card_send_command... size=%d\n", size); - commandbuf = (unsigned char *)kmalloc(size + 2, GFP_KERNEL); + commandbuf = kmalloc(size + 2, GFP_KERNEL); memcpy((void *)commandbuf + 2, (void *)ptempbuffer, size); ft1000_read_register(ft1000dev, &temp, FT1000_REG_DOORBELL);