diff options
Diffstat (limited to 'drivers/isdn/gigaset')
-rw-r--r-- | drivers/isdn/gigaset/bas-gigaset.c | 14 | ||||
-rw-r--r-- | drivers/isdn/gigaset/usb-gigaset.c | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c index 5857e7e23f84..63b629b1cdb2 100644 --- a/drivers/isdn/gigaset/bas-gigaset.c +++ b/drivers/isdn/gigaset/bas-gigaset.c | |||
@@ -2218,21 +2218,21 @@ static int gigaset_probe(struct usb_interface *interface, | |||
2218 | * - three for the different uses of the default control pipe | 2218 | * - three for the different uses of the default control pipe |
2219 | * - three for each isochronous pipe | 2219 | * - three for each isochronous pipe |
2220 | */ | 2220 | */ |
2221 | if (!(ucs->urb_int_in = usb_alloc_urb(0, SLAB_KERNEL)) || | 2221 | if (!(ucs->urb_int_in = usb_alloc_urb(0, GFP_KERNEL)) || |
2222 | !(ucs->urb_cmd_in = usb_alloc_urb(0, SLAB_KERNEL)) || | 2222 | !(ucs->urb_cmd_in = usb_alloc_urb(0, GFP_KERNEL)) || |
2223 | !(ucs->urb_cmd_out = usb_alloc_urb(0, SLAB_KERNEL)) || | 2223 | !(ucs->urb_cmd_out = usb_alloc_urb(0, GFP_KERNEL)) || |
2224 | !(ucs->urb_ctrl = usb_alloc_urb(0, SLAB_KERNEL))) | 2224 | !(ucs->urb_ctrl = usb_alloc_urb(0, GFP_KERNEL))) |
2225 | goto allocerr; | 2225 | goto allocerr; |
2226 | 2226 | ||
2227 | for (j = 0; j < 2; ++j) { | 2227 | for (j = 0; j < 2; ++j) { |
2228 | ubc = cs->bcs[j].hw.bas; | 2228 | ubc = cs->bcs[j].hw.bas; |
2229 | for (i = 0; i < BAS_OUTURBS; ++i) | 2229 | for (i = 0; i < BAS_OUTURBS; ++i) |
2230 | if (!(ubc->isoouturbs[i].urb = | 2230 | if (!(ubc->isoouturbs[i].urb = |
2231 | usb_alloc_urb(BAS_NUMFRAMES, SLAB_KERNEL))) | 2231 | usb_alloc_urb(BAS_NUMFRAMES, GFP_KERNEL))) |
2232 | goto allocerr; | 2232 | goto allocerr; |
2233 | for (i = 0; i < BAS_INURBS; ++i) | 2233 | for (i = 0; i < BAS_INURBS; ++i) |
2234 | if (!(ubc->isoinurbs[i] = | 2234 | if (!(ubc->isoinurbs[i] = |
2235 | usb_alloc_urb(BAS_NUMFRAMES, SLAB_KERNEL))) | 2235 | usb_alloc_urb(BAS_NUMFRAMES, GFP_KERNEL))) |
2236 | goto allocerr; | 2236 | goto allocerr; |
2237 | } | 2237 | } |
2238 | 2238 | ||
@@ -2246,7 +2246,7 @@ static int gigaset_probe(struct usb_interface *interface, | |||
2246 | (endpoint->bEndpointAddress) & 0x0f), | 2246 | (endpoint->bEndpointAddress) & 0x0f), |
2247 | ucs->int_in_buf, 3, read_int_callback, cs, | 2247 | ucs->int_in_buf, 3, read_int_callback, cs, |
2248 | endpoint->bInterval); | 2248 | endpoint->bInterval); |
2249 | if ((rc = usb_submit_urb(ucs->urb_int_in, SLAB_KERNEL)) != 0) { | 2249 | if ((rc = usb_submit_urb(ucs->urb_int_in, GFP_KERNEL)) != 0) { |
2250 | dev_err(cs->dev, "could not submit interrupt URB: %s\n", | 2250 | dev_err(cs->dev, "could not submit interrupt URB: %s\n", |
2251 | get_usb_rcmsg(rc)); | 2251 | get_usb_rcmsg(rc)); |
2252 | goto error; | 2252 | goto error; |
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c index af89ce188f2a..04f2ad7ba8b0 100644 --- a/drivers/isdn/gigaset/usb-gigaset.c +++ b/drivers/isdn/gigaset/usb-gigaset.c | |||
@@ -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; |