From d6179c53d2bb2c5c2dd1c2c228f21a737ac53e5e Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Tue, 8 Jan 2013 12:52:32 -0500 Subject: [PATCH] --- yaml --- r: 353992 b: refs/heads/master c: b5b384b7277aa01b839850fb4092fd247c2bae98 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/vt6655/device.h | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 409118f5c9ae..dcfb56292c2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bbc0bc06b8b0cced31ee17beb753ad51a2e47e7 +refs/heads/master: b5b384b7277aa01b839850fb4092fd247c2bae98 diff --git a/trunk/drivers/staging/vt6655/device.h b/trunk/drivers/staging/vt6655/device.h index e54e00bc5665..1a077f9ea2a1 100644 --- a/trunk/drivers/staging/vt6655/device.h +++ b/trunk/drivers/staging/vt6655/device.h @@ -882,14 +882,7 @@ inline static bool device_get_ip(PSDevice pInfo) { static inline PDEVICE_RD_INFO alloc_rd_info(void) { - PDEVICE_RD_INFO ptr; - ptr = (PDEVICE_RD_INFO)kmalloc((int)sizeof(DEVICE_RD_INFO), (int)GFP_ATOMIC); - if (ptr == NULL) - return NULL; - else { - memset(ptr,0,sizeof(DEVICE_RD_INFO)); - return ptr; - } + return kzalloc(sizeof(DEVICE_RD_INFO), GFP_ATOMIC); } static inline PDEVICE_TD_INFO alloc_td_info(void) {