diff --git a/[refs] b/[refs] index 5350946da29a..b035f4cecba7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8473f6544ec84135ce1f4eb8a3f7144a53fe70bb +refs/heads/master: d1b46e75fb307132ebbfdd65055bf622cc3f646e diff --git a/trunk/drivers/staging/vt6655/device.h b/trunk/drivers/staging/vt6655/device.h index 64d923c603e8..e27244ce383e 100644 --- a/trunk/drivers/staging/vt6655/device.h +++ b/trunk/drivers/staging/vt6655/device.h @@ -886,15 +886,9 @@ static inline PDEVICE_RD_INFO alloc_rd_info(void) return kzalloc(sizeof(DEVICE_RD_INFO), GFP_ATOMIC); } -static inline PDEVICE_TD_INFO alloc_td_info(void) { - PDEVICE_TD_INFO ptr; - ptr = (PDEVICE_TD_INFO)kmalloc((int)sizeof(DEVICE_TD_INFO), (int)GFP_ATOMIC); - if (ptr == NULL) - return NULL; - else { - memset(ptr,0,sizeof(DEVICE_TD_INFO)); - return ptr; - } +static inline PDEVICE_TD_INFO alloc_td_info(void) +{ + return kzalloc(sizeof(DEVICE_TD_INFO), GFP_ATOMIC); } /*--------------------- Export Functions --------------------------*/