diff options
Diffstat (limited to 'drivers/isdn/gigaset/usb-gigaset.c')
-rw-r--r-- | drivers/isdn/gigaset/usb-gigaset.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c index 5ebf49ac9b23..04f2ad7ba8b0 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) | |||
410 | 410 | ||
411 | if (resubmit) { | 411 | if (resubmit) { |
412 | spin_lock_irqsave(&cs->lock, flags); | 412 | spin_lock_irqsave(&cs->lock, flags); |
413 | r = cs->connected ? usb_submit_urb(urb, SLAB_ATOMIC) : -ENODEV; | 413 | r = cs->connected ? usb_submit_urb(urb, GFP_ATOMIC) : -ENODEV; |
414 | spin_unlock_irqrestore(&cs->lock, flags); | 414 | spin_unlock_irqrestore(&cs->lock, flags); |
415 | if (r) | 415 | if (r) |
416 | dev_err(cs->dev, "error %d when resubmitting urb.\n", | 416 | 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) | |||
486 | atomic_set(&ucs->busy, 1); | 486 | atomic_set(&ucs->busy, 1); |
487 | 487 | ||
488 | spin_lock_irqsave(&cs->lock, flags); | 488 | spin_lock_irqsave(&cs->lock, flags); |
489 | status = cs->connected ? usb_submit_urb(ucs->bulk_out_urb, SLAB_ATOMIC) : -ENODEV; | 489 | status = cs->connected ? usb_submit_urb(ucs->bulk_out_urb, GFP_ATOMIC) : -ENODEV; |
490 | spin_unlock_irqrestore(&cs->lock, flags); | 490 | spin_unlock_irqrestore(&cs->lock, flags); |
491 | 491 | ||
492 | if (status) { | 492 | if (status) { |
@@ -664,7 +664,7 @@ static int write_modem(struct cardstate *cs) | |||
664 | ucs->bulk_out_endpointAddr & 0x0f), | 664 | ucs->bulk_out_endpointAddr & 0x0f), |
665 | ucs->bulk_out_buffer, count, | 665 | ucs->bulk_out_buffer, count, |
666 | gigaset_write_bulk_callback, cs); | 666 | gigaset_write_bulk_callback, cs); |
667 | ret = usb_submit_urb(ucs->bulk_out_urb, SLAB_ATOMIC); | 667 | ret = usb_submit_urb(ucs->bulk_out_urb, GFP_ATOMIC); |
668 | } else { | 668 | } else { |
669 | ret = -ENODEV; | 669 | ret = -ENODEV; |
670 | } | 670 | } |
@@ -763,7 +763,7 @@ static int gigaset_probe(struct usb_interface *interface, | |||
763 | goto error; | 763 | goto error; |
764 | } | 764 | } |
765 | 765 | ||
766 | ucs->bulk_out_urb = usb_alloc_urb(0, SLAB_KERNEL); | 766 | ucs->bulk_out_urb = usb_alloc_urb(0, GFP_KERNEL); |
767 | if (!ucs->bulk_out_urb) { | 767 | if (!ucs->bulk_out_urb) { |
768 | dev_err(cs->dev, "Couldn't allocate bulk_out_urb\n"); | 768 | dev_err(cs->dev, "Couldn't allocate bulk_out_urb\n"); |
769 | retval = -ENOMEM; | 769 | retval = -ENOMEM; |
@@ -774,7 +774,7 @@ static int gigaset_probe(struct usb_interface *interface, | |||
774 | 774 | ||
775 | atomic_set(&ucs->busy, 0); | 775 | atomic_set(&ucs->busy, 0); |
776 | 776 | ||
777 | ucs->read_urb = usb_alloc_urb(0, SLAB_KERNEL); | 777 | ucs->read_urb = usb_alloc_urb(0, GFP_KERNEL); |
778 | if (!ucs->read_urb) { | 778 | if (!ucs->read_urb) { |
779 | dev_err(cs->dev, "No free urbs available\n"); | 779 | dev_err(cs->dev, "No free urbs available\n"); |
780 | retval = -ENOMEM; | 780 | retval = -ENOMEM; |
@@ -797,7 +797,7 @@ static int gigaset_probe(struct usb_interface *interface, | |||
797 | gigaset_read_int_callback, | 797 | gigaset_read_int_callback, |
798 | cs->inbuf + 0, endpoint->bInterval); | 798 | cs->inbuf + 0, endpoint->bInterval); |
799 | 799 | ||
800 | retval = usb_submit_urb(ucs->read_urb, SLAB_KERNEL); | 800 | retval = usb_submit_urb(ucs->read_urb, GFP_KERNEL); |
801 | if (retval) { | 801 | if (retval) { |
802 | dev_err(cs->dev, "Could not submit URB (error %d)\n", -retval); | 802 | dev_err(cs->dev, "Could not submit URB (error %d)\n", -retval); |
803 | goto error; | 803 | goto error; |