diff options
Diffstat (limited to 'drivers/isdn/gigaset/bas-gigaset.c')
-rw-r--r-- | drivers/isdn/gigaset/bas-gigaset.c | 20 |
1 files changed, 10 insertions, 10 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) | |||
572 | ucs->rcvbuf, ucs->rcvbuf_size, | 572 | ucs->rcvbuf, ucs->rcvbuf_size, |
573 | read_ctrl_callback, cs->inbuf); | 573 | read_ctrl_callback, cs->inbuf); |
574 | 574 | ||
575 | if ((ret = usb_submit_urb(ucs->urb_cmd_in, SLAB_ATOMIC)) != 0) { | 575 | if ((ret = usb_submit_urb(ucs->urb_cmd_in, GFP_ATOMIC)) != 0) { |
576 | update_basstate(ucs, 0, BS_ATRDPEND); | 576 | update_basstate(ucs, 0, BS_ATRDPEND); |
577 | dev_err(cs->dev, "could not submit HD_READ_ATMESSAGE: %s\n", | 577 | dev_err(cs->dev, "could not submit HD_READ_ATMESSAGE: %s\n", |
578 | get_usb_rcmsg(ret)); | 578 | get_usb_rcmsg(ret)); |
@@ -747,7 +747,7 @@ static void read_int_callback(struct urb *urb) | |||
747 | check_pending(ucs); | 747 | check_pending(ucs); |
748 | 748 | ||
749 | resubmit: | 749 | resubmit: |
750 | rc = usb_submit_urb(urb, SLAB_ATOMIC); | 750 | rc = usb_submit_urb(urb, GFP_ATOMIC); |
751 | if (unlikely(rc != 0 && rc != -ENODEV)) { | 751 | if (unlikely(rc != 0 && rc != -ENODEV)) { |
752 | dev_err(cs->dev, "could not resubmit interrupt URB: %s\n", | 752 | dev_err(cs->dev, "could not resubmit interrupt URB: %s\n", |
753 | get_usb_rcmsg(rc)); | 753 | get_usb_rcmsg(rc)); |
@@ -807,7 +807,7 @@ static void read_iso_callback(struct urb *urb) | |||
807 | urb->number_of_packets = BAS_NUMFRAMES; | 807 | urb->number_of_packets = BAS_NUMFRAMES; |
808 | gig_dbg(DEBUG_ISO, "%s: isoc read overrun/resubmit", | 808 | gig_dbg(DEBUG_ISO, "%s: isoc read overrun/resubmit", |
809 | __func__); | 809 | __func__); |
810 | rc = usb_submit_urb(urb, SLAB_ATOMIC); | 810 | rc = usb_submit_urb(urb, GFP_ATOMIC); |
811 | if (unlikely(rc != 0 && rc != -ENODEV)) { | 811 | if (unlikely(rc != 0 && rc != -ENODEV)) { |
812 | dev_err(bcs->cs->dev, | 812 | dev_err(bcs->cs->dev, |
813 | "could not resubmit isochronous read " | 813 | "could not resubmit isochronous read " |
@@ -900,7 +900,7 @@ static int starturbs(struct bc_state *bcs) | |||
900 | } | 900 | } |
901 | 901 | ||
902 | dump_urb(DEBUG_ISO, "Initial isoc read", urb); | 902 | dump_urb(DEBUG_ISO, "Initial isoc read", urb); |
903 | if ((rc = usb_submit_urb(urb, SLAB_ATOMIC)) != 0) | 903 | if ((rc = usb_submit_urb(urb, GFP_ATOMIC)) != 0) |
904 | goto error; | 904 | goto error; |
905 | } | 905 | } |
906 | 906 | ||
@@ -935,7 +935,7 @@ static int starturbs(struct bc_state *bcs) | |||
935 | /* submit two URBs, keep third one */ | 935 | /* submit two URBs, keep third one */ |
936 | for (k = 0; k < 2; ++k) { | 936 | for (k = 0; k < 2; ++k) { |
937 | dump_urb(DEBUG_ISO, "Initial isoc write", urb); | 937 | dump_urb(DEBUG_ISO, "Initial isoc write", urb); |
938 | rc = usb_submit_urb(ubc->isoouturbs[k].urb, SLAB_ATOMIC); | 938 | rc = usb_submit_urb(ubc->isoouturbs[k].urb, GFP_ATOMIC); |
939 | if (rc != 0) | 939 | if (rc != 0) |
940 | goto error; | 940 | goto error; |
941 | } | 941 | } |
@@ -1042,7 +1042,7 @@ static int submit_iso_write_urb(struct isow_urbctx_t *ucx) | |||
1042 | return 0; /* no data to send */ | 1042 | return 0; /* no data to send */ |
1043 | urb->number_of_packets = nframe; | 1043 | urb->number_of_packets = nframe; |
1044 | 1044 | ||
1045 | rc = usb_submit_urb(urb, SLAB_ATOMIC); | 1045 | rc = usb_submit_urb(urb, GFP_ATOMIC); |
1046 | if (unlikely(rc)) { | 1046 | if (unlikely(rc)) { |
1047 | if (rc == -ENODEV) | 1047 | if (rc == -ENODEV) |
1048 | /* device removed - give up silently */ | 1048 | /* device removed - give up silently */ |
@@ -1341,7 +1341,7 @@ static void read_iso_tasklet(unsigned long data) | |||
1341 | urb->dev = bcs->cs->hw.bas->udev; | 1341 | urb->dev = bcs->cs->hw.bas->udev; |
1342 | urb->transfer_flags = URB_ISO_ASAP; | 1342 | urb->transfer_flags = URB_ISO_ASAP; |
1343 | urb->number_of_packets = BAS_NUMFRAMES; | 1343 | urb->number_of_packets = BAS_NUMFRAMES; |
1344 | rc = usb_submit_urb(urb, SLAB_ATOMIC); | 1344 | rc = usb_submit_urb(urb, GFP_ATOMIC); |
1345 | if (unlikely(rc != 0 && rc != -ENODEV)) { | 1345 | if (unlikely(rc != 0 && rc != -ENODEV)) { |
1346 | dev_err(cs->dev, | 1346 | dev_err(cs->dev, |
1347 | "could not resubmit isochronous read URB: %s\n", | 1347 | "could not resubmit isochronous read URB: %s\n", |
@@ -1458,7 +1458,7 @@ static void write_ctrl_callback(struct urb *urb) | |||
1458 | ucs->retry_ctrl); | 1458 | ucs->retry_ctrl); |
1459 | /* urb->dev is clobbered by USB subsystem */ | 1459 | /* urb->dev is clobbered by USB subsystem */ |
1460 | urb->dev = ucs->udev; | 1460 | urb->dev = ucs->udev; |
1461 | rc = usb_submit_urb(urb, SLAB_ATOMIC); | 1461 | rc = usb_submit_urb(urb, GFP_ATOMIC); |
1462 | if (unlikely(rc)) { | 1462 | if (unlikely(rc)) { |
1463 | dev_err(&ucs->interface->dev, | 1463 | dev_err(&ucs->interface->dev, |
1464 | "could not resubmit request 0x%02x: %s\n", | 1464 | "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) | |||
1517 | (unsigned char*) &ucs->dr_ctrl, NULL, 0, | 1517 | (unsigned char*) &ucs->dr_ctrl, NULL, 0, |
1518 | write_ctrl_callback, ucs); | 1518 | write_ctrl_callback, ucs); |
1519 | ucs->retry_ctrl = 0; | 1519 | ucs->retry_ctrl = 0; |
1520 | ret = usb_submit_urb(ucs->urb_ctrl, SLAB_ATOMIC); | 1520 | ret = usb_submit_urb(ucs->urb_ctrl, GFP_ATOMIC); |
1521 | if (unlikely(ret)) { | 1521 | if (unlikely(ret)) { |
1522 | dev_err(bcs->cs->dev, "could not submit request 0x%02x: %s\n", | 1522 | dev_err(bcs->cs->dev, "could not submit request 0x%02x: %s\n", |
1523 | req, get_usb_rcmsg(ret)); | 1523 | req, get_usb_rcmsg(ret)); |
@@ -1763,7 +1763,7 @@ static int atwrite_submit(struct cardstate *cs, unsigned char *buf, int len) | |||
1763 | usb_sndctrlpipe(ucs->udev, 0), | 1763 | usb_sndctrlpipe(ucs->udev, 0), |
1764 | (unsigned char*) &ucs->dr_cmd_out, buf, len, | 1764 | (unsigned char*) &ucs->dr_cmd_out, buf, len, |
1765 | write_command_callback, cs); | 1765 | write_command_callback, cs); |
1766 | rc = usb_submit_urb(ucs->urb_cmd_out, SLAB_ATOMIC); | 1766 | rc = usb_submit_urb(ucs->urb_cmd_out, GFP_ATOMIC); |
1767 | if (unlikely(rc)) { | 1767 | if (unlikely(rc)) { |
1768 | update_basstate(ucs, 0, BS_ATWRPEND); | 1768 | update_basstate(ucs, 0, BS_ATWRPEND); |
1769 | dev_err(cs->dev, "could not submit HD_WRITE_ATMESSAGE: %s\n", | 1769 | dev_err(cs->dev, "could not submit HD_WRITE_ATMESSAGE: %s\n", |