From e1d1f57738ff5a2469c77862ac889db6bad13439 Mon Sep 17 00:00:00 2001 From: Alexey Khoroshilov Date: Mon, 30 May 2011 07:06:24 +0000 Subject: [PATCH] --- yaml --- r: 253049 b: refs/heads/master c: 930a6eac9f40e692bd9670d89bcd9ac0f4019356 h: refs/heads/master i: 253047: 2ceb762861d3b77dcd1724bcc40b43f61481913d v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/catc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index eff2b218a622..eae49c77cacc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a000c01e60e40e15304ffe48fff051d17a7bea91 +refs/heads/master: 930a6eac9f40e692bd9670d89bcd9ac0f4019356 diff --git a/trunk/drivers/net/usb/catc.c b/trunk/drivers/net/usb/catc.c index d7221c4a5dcf..8056f8a27c6a 100644 --- a/trunk/drivers/net/usb/catc.c +++ b/trunk/drivers/net/usb/catc.c @@ -495,7 +495,7 @@ static void catc_ctrl_run(struct catc *catc) if (!q->dir && q->buf && q->len) memcpy(catc->ctrl_buf, q->buf, q->len); - if ((status = usb_submit_urb(catc->ctrl_urb, GFP_KERNEL))) + if ((status = usb_submit_urb(catc->ctrl_urb, GFP_ATOMIC))) err("submit(ctrl_urb) status %d", status); }