From: Tapasweni Pathak Date: Fri, 20 Feb 2015 13:13:53 +0000 (+0530) Subject: staging: emxx_udc: Replace GFP_KERNEL with GFP_ATOMIC X-Git-Tag: v4.1-rc1~152^2~138^2~1012 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4a0721bf84da588bec013220f74563add71c0bbe;p=karo-tx-linux.git staging: emxx_udc: Replace GFP_KERNEL with GFP_ATOMIC To avoid deadlock, do not call blocking functions with spinlocks held. Replace GFP_KERNEL with GFP_ATOMIC, as the latter will fail if the pile doesn't have enough free pages but will not sleep and hence deadlock can be avoided. Found by Coccinelle. Signed-off-by: Tapasweni Pathak Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c index 4be646ce8a12..6c1de2770e6a 100644 --- a/drivers/staging/emxx_udc/emxx_udc.c +++ b/drivers/staging/emxx_udc/emxx_udc.c @@ -2794,7 +2794,7 @@ static int nbu2ss_ep_queue( if (ep->virt_buf == NULL) ep->virt_buf = (u8 *)dma_alloc_coherent( NULL, PAGE_SIZE, - &ep->phys_buf, GFP_KERNEL | GFP_DMA); + &ep->phys_buf, GFP_ATOMIC | GFP_DMA); if (ep->epnum > 0) { if (ep->direct == USB_DIR_IN) memcpy(ep->virt_buf, req->req.buf,