2 files changed, 13 insertions, 13 deletions

diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index 0c937325a1b3..5857e7e23f84 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -572,7 +572,7 @@ static int atread_submit(struct cardstate *cs, int timeout)
                              ucs->rcvbuf, ucs->rcvbuf_size,
                              read_ctrl_callback, cs->inbuf);
 
-        if ((ret = usb_submit_urb(ucs->urb_cmd_in, SLAB_ATOMIC)) != 0) {
+        if ((ret = usb_submit_urb(ucs->urb_cmd_in, GFP_ATOMIC)) != 0) {
                 update_basstate(ucs, 0, BS_ATRDPEND);
                 dev_err(cs->dev, "could not submit HD_READ_ATMESSAGE: %s\n",
                         get_usb_rcmsg(ret));
@@ -747,7 +747,7 @@ static void read_int_callback(struct urb *urb)
         check_pending(ucs);
 
 resubmit:
-        rc = usb_submit_urb(urb, SLAB_ATOMIC);
+        rc = usb_submit_urb(urb, GFP_ATOMIC);
         if (unlikely(rc != 0 && rc != -ENODEV)) {
                 dev_err(cs->dev, "could not resubmit interrupt URB: %s\n",
                         get_usb_rcmsg(rc));
@@ -807,7 +807,7 @@ static void read_iso_callback(struct urb *urb)
                         urb->number_of_packets = BAS_NUMFRAMES;
                         gig_dbg(DEBUG_ISO, "%s: isoc read overrun/resubmit",
                                 __func__);
-                        rc = usb_submit_urb(urb, SLAB_ATOMIC);
+                        rc = usb_submit_urb(urb, GFP_ATOMIC);
                         if (unlikely(rc != 0 && rc != -ENODEV)) {
                                 dev_err(bcs->cs->dev,
                                         "could not resubmit isochronous read "
@@ -900,7 +900,7 @@ static int starturbs(struct bc_state *bcs)
                 }
 
                 dump_urb(DEBUG_ISO, "Initial isoc read", urb);
-                if ((rc = usb_submit_urb(urb, SLAB_ATOMIC)) != 0)
+                if ((rc = usb_submit_urb(urb, GFP_ATOMIC)) != 0)
                         goto error;
         }
 
@@ -935,7 +935,7 @@ static int starturbs(struct bc_state *bcs)
         /* submit two URBs, keep third one */
         for (k = 0; k < 2; ++k) {
                 dump_urb(DEBUG_ISO, "Initial isoc write", urb);
-                rc = usb_submit_urb(ubc->isoouturbs[k].urb, SLAB_ATOMIC);
+                rc = usb_submit_urb(ubc->isoouturbs[k].urb, GFP_ATOMIC);
                 if (rc != 0)
                         goto error;
         }
@@ -1042,7 +1042,7 @@ static int submit_iso_write_urb(struct isow_urbctx_t *ucx)
                 return 0;       /* no data to send */
         urb->number_of_packets = nframe;
 
-        rc = usb_submit_urb(urb, SLAB_ATOMIC);
+        rc = usb_submit_urb(urb, GFP_ATOMIC);
         if (unlikely(rc)) {
                 if (rc == -ENODEV)
                         /* device removed - give up silently */
@@ -1341,7 +1341,7 @@ static void read_iso_tasklet(unsigned long data)
                 urb->dev = bcs->cs->hw.bas->udev;
                 urb->transfer_flags = URB_ISO_ASAP;
                 urb->number_of_packets = BAS_NUMFRAMES;
-                rc = usb_submit_urb(urb, SLAB_ATOMIC);
+                rc = usb_submit_urb(urb, GFP_ATOMIC);
                 if (unlikely(rc != 0 && rc != -ENODEV)) {
                         dev_err(cs->dev,
                                 "could not resubmit isochronous read URB: %s\n",
@@ -1458,7 +1458,7 @@ static void write_ctrl_callback(struct urb *urb)
                            ucs->retry_ctrl);
                 /* urb->dev is clobbered by USB subsystem */
                 urb->dev = ucs->udev;
-                rc = usb_submit_urb(urb, SLAB_ATOMIC);
+                rc = usb_submit_urb(urb, GFP_ATOMIC);
                 if (unlikely(rc)) {
                         dev_err(&ucs->interface->dev,
                                 "could not resubmit request 0x%02x: %s\n",
@@ -1517,7 +1517,7 @@ static int req_submit(struct bc_state *bcs, int req, int val, int timeout)
                              (unsigned char*) &ucs->dr_ctrl, NULL, 0,
                              write_ctrl_callback, ucs);
         ucs->retry_ctrl = 0;
-        ret = usb_submit_urb(ucs->urb_ctrl, SLAB_ATOMIC);
+        ret = usb_submit_urb(ucs->urb_ctrl, GFP_ATOMIC);
         if (unlikely(ret)) {
                 dev_err(bcs->cs->dev, "could not submit request 0x%02x: %s\n",
                         req, get_usb_rcmsg(ret));
@@ -1763,7 +1763,7 @@ static int atwrite_submit(struct cardstate *cs, unsigned char *buf, int len)
                              usb_sndctrlpipe(ucs->udev, 0),
                              (unsigned char*) &ucs->dr_cmd_out, buf, len,
                              write_command_callback, cs);
-        rc = usb_submit_urb(ucs->urb_cmd_out, SLAB_ATOMIC);
+        rc = usb_submit_urb(ucs->urb_cmd_out, GFP_ATOMIC);
         if (unlikely(rc)) {
                 update_basstate(ucs, 0, BS_ATWRPEND);
                 dev_err(cs->dev, "could not submit HD_WRITE_ATMESSAGE: %s\n",
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index 5ebf49ac9b23..af89ce188f2a 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -410,7 +410,7 @@ static void gigaset_read_int_callback(struct urb *urb)
 
         if (resubmit) {
                 spin_lock_irqsave(&cs->lock, flags);
-                r = cs->connected ? usb_submit_urb(urb, SLAB_ATOMIC) : -ENODEV;
+                r = cs->connected ? usb_submit_urb(urb, GFP_ATOMIC) : -ENODEV;
                 spin_unlock_irqrestore(&cs->lock, flags);
                 if (r)
                         dev_err(cs->dev, "error %d when resubmitting urb.\n",
@@ -486,7 +486,7 @@ static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb)
                         atomic_set(&ucs->busy, 1);
 
                         spin_lock_irqsave(&cs->lock, flags);
-                        status = cs->connected ? usb_submit_urb(ucs->bulk_out_urb, SLAB_ATOMIC) : -ENODEV;
+                        status = cs->connected ? usb_submit_urb(ucs->bulk_out_urb, GFP_ATOMIC) : -ENODEV;
                         spin_unlock_irqrestore(&cs->lock, flags);
 
                         if (status) {
@@ -664,7 +664,7 @@ static int write_modem(struct cardstate *cs)
                                                   ucs->bulk_out_endpointAddr & 0x0f),
                                   ucs->bulk_out_buffer, count,
                                   gigaset_write_bulk_callback, cs);
-                ret = usb_submit_urb(ucs->bulk_out_urb, SLAB_ATOMIC);
+                ret = usb_submit_urb(ucs->bulk_out_urb, GFP_ATOMIC);
         } else {
                 ret = -ENODEV;
         }