--- hpusbscsi.c.alt Fri Feb 8 15:59:22 2002
+++ hpusbscsi.c Sat Feb 9 11:00:01 2002
@@ -56,12 +56,12 @@
return NULL;
DEBUG ("Allocated memory\n");
memset (new, 0, sizeof (struct hpusbscsi));
- new->dataurb = usb_alloc_urb(0);
+ new->dataurb = usb_alloc_urb(0, GFP_KERNEL);
if (!new->dataurb) {
kfree (new);
return NULL;
}
- new->controlurb = usb_alloc_urb(0);
+ new->controlurb = usb_alloc_urb(0, GFP_KERNEL);
if (!new->controlurb) {
usb_free_urb (new->dataurb);
kfree (new);
--- kaweth.c.p Fri Feb 8 15:59:22 2002
+++ kaweth.c Sat Feb 9 11:01:44 2002
@@ -872,8 +872,8 @@
kaweth_dbg("Initializing net device.");
- kaweth->tx_urb = usb_alloc_urb(0);
- kaweth->rx_urb = usb_alloc_urb(0);
+ kaweth->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
+ kaweth->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
kaweth->net = init_etherdev(0, 0);
if (!kaweth->net) {
@@ -1019,7 +1019,7 @@
int retv;
int length;
- urb = usb_alloc_urb(0);
+ urb = usb_alloc_urb(0, GFP_KERNEL);
if (!urb)
return -ENOMEM;
--- mdc800.c.p Fri Feb 8 15:59:22 2002
+++ mdc800.c Sat Feb 9 11:03:12 2002
@@ -968,9 +968,9 @@
try (mdc800->write_urb_buffer=kmalloc (8, GFP_KERNEL));
try (mdc800->download_urb_buffer=kmalloc (64, GFP_KERNEL));
- try (mdc800->irq_urb=usb_alloc_urb (0));
- try (mdc800->download_urb=usb_alloc_urb (0));
- try (mdc800->write_urb=usb_alloc_urb (0));
+ try (mdc800->irq_urb=usb_alloc_urb (0, GFP_KERNEL));
+ try (mdc800->download_urb=usb_alloc_urb (0, GFP_KERNEL));
+ try (mdc800->write_urb=usb_alloc_urb (0, GFP_KERNEL));
/* Register the driver */
if (usb_register (&mdc800_usb_driver) < 0)
--- microtek.c.p Fri Feb 8 15:59:22 2002
+++ microtek.c Sat Feb 9 11:04:14 2002
@@ -936,7 +936,7 @@
}
memset( new_desc, 0, sizeof(*new_desc) );
- new_desc->urb = usb_alloc_urb(0);
+ new_desc->urb = usb_alloc_urb(0, GFP_KERNEL);
if (!new_desc->urb) {
kfree(new_desc);
return NULL;
--- ov511.c.p Fri Feb 8 15:59:22 2002
+++ ov511.c Sat Feb 9 11:06:22 2002
@@ -4426,7 +4426,7 @@
}
for (n = 0; n < OV511_NUMSBUF; n++) {
- urb = usb_alloc_urb(FRAMES_PER_DESC);
+ urb = usb_alloc_urb(FRAMES_PER_DESC, GFP_KERNEL);
if (!urb) {
err("init isoc: usb_alloc_urb ret. NULL");
--- pegasus.c.p Fri Feb 8 15:59:22 2002
+++ pegasus.c Sat Feb 9 11:08:07 2002
@@ -857,25 +857,25 @@
pegasus->dev_index = dev_index;
init_waitqueue_head( &pegasus->ctrl_wait );
- pegasus->ctrl_urb = usb_alloc_urb(0);
+ pegasus->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!pegasus->ctrl_urb) {
kfree (pegasus);
return NULL;
}
- pegasus->rx_urb = usb_alloc_urb(0);
+ pegasus->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!pegasus->rx_urb) {
usb_free_urb (pegasus->ctrl_urb);
kfree (pegasus);
return NULL;
}
- pegasus->tx_urb = usb_alloc_urb(0);
+ pegasus->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!pegasus->tx_urb) {
usb_free_urb (pegasus->rx_urb);
usb_free_urb (pegasus->ctrl_urb);
kfree (pegasus);
return NULL;
}
- pegasus->intr_urb = usb_alloc_urb(0);
+ pegasus->intr_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!pegasus->intr_urb) {
usb_free_urb (pegasus->tx_urb);
usb_free_urb (pegasus->rx_urb);
--- pwc-if.c.p Fri Feb 8 15:59:22 2002
+++ pwc-if.c Sat Feb 9 11:09:49 2002
@@ -827,7 +827,7 @@
ret = 0;
for (i = 0; i < MAX_ISO_BUFS; i++) {
- urb = usb_alloc_urb(ISO_FRAMES_PER_DESC);
+ urb = usb_alloc_urb(ISO_FRAMES_PER_DESC, GFP_KERNEL);
if (urb == NULL) {
Err("Failed to allocate urb %d\n", i);
ret = -ENOMEM;
--- scanner.c.p Fri Feb 8 15:59:23 2002
+++ scanner.c Sat Feb 9 11:10:53 2002
@@ -972,7 +972,7 @@
}
memset (scn, 0, sizeof(struct scn_usb_data));
- scn->scn_irq = usb_alloc_urb(0);
+ scn->scn_irq = usb_alloc_urb(0, GFP_KERNEL);
if (!scn->scn_irq) {
kfree(scn);
up(&scn_mutex);
--- se401.c.p Fri Feb 8 15:59:23 2002
+++ se401.c Sat Feb 9 11:12:19 2002
@@ -644,7 +644,7 @@
}
for (i=0; i<SE401_NUMSBUF; i++) {
- urb=usb_alloc_urb(0);
+ urb=usb_alloc_urb(0, GFP_KERNEL);
if(!urb)
return ENOMEM;
@@ -1465,7 +1465,7 @@
se401->readcount=0;
/* Start interrupt transfers for snapshot button */
- se401->inturb=usb_alloc_urb(0);
+ se401->inturb=usb_alloc_urb(0, GFP_KERNEL);
if (!se401->inturb) {
info("Allocation of inturb failed");
return 1;
--- stv680.c.p Fri Feb 8 15:59:23 2002
+++ stv680.c Sat Feb 9 11:13:13 2002
@@ -804,7 +804,7 @@
}
for (i = 0; i < STV680_NUMSBUF; i++) {
- urb = usb_alloc_urb (0);
+ urb = usb_alloc_urb (0, GFP_KERNEL);
if (!urb)
return ENOMEM;
--- usb-skeleton.c.p Fri Feb 8 15:59:23 2002
+++ usb-skeleton.c Sat Feb 9 11:14:35 2002
@@ -573,7 +573,8 @@
if (((endpoint->bEndpointAddress & 0x80) == 0x00) &&
((endpoint->bmAttributes & 3) == 0x02)) {
/* we found a bulk out endpoint */
- dev->write_urb = usb_alloc_urb(0);
+ /* we are free to sleep to allocate an URB */
+ dev->write_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!dev->write_urb) {
err("No free urbs available");
goto error;
--- usbkbd.c.p Fri Feb 8 15:59:23 2002
+++ usbkbd.c Sat Feb 9 11:15:53 2002
@@ -201,12 +201,12 @@
if (!(kbd = kmalloc(sizeof(struct usb_kbd), GFP_KERNEL))) return NULL;
memset(kbd, 0, sizeof(struct usb_kbd));
- kbd->irq = usb_alloc_urb(0);
+ kbd->irq = usb_alloc_urb(0, GFP_KERNEL);
if (!kbd->irq) {
kfree(kbd);
return NULL;
}
- kbd->led = usb_alloc_urb(0);
+ kbd->led = usb_alloc_urb(0, GFP_KERNEL);
if (!kbd->led) {
usb_free_urb(kbd->irq);
kfree(kbd);
--- usbmouse.c.p Fri Feb 8 15:59:23 2002
+++ usbmouse.c Sat Feb 9 11:16:46 2002
@@ -126,7 +126,7 @@
if (!(mouse = kmalloc(sizeof(struct usb_mouse), GFP_KERNEL))) return NULL;
memset(mouse, 0, sizeof(struct usb_mouse));
- mouse->irq = usb_alloc_urb(0);
+ mouse->irq = usb_alloc_urb(0, GFP_KERNEL);
if (!mouse->irq) {
kfree(mouse);
return NULL;
--- usbnet.c.p Fri Feb 8 15:59:23 2002
+++ usbnet.c Sat Feb 9 11:18:22 2002
@@ -420,7 +420,7 @@
}
// allocate irq urb
- if ((priv->irq_urb = usb_alloc_urb (0)) == 0) {
+ if ((priv->irq_urb = usb_alloc_urb (0, GFP_KERNEL)) == 0) {
dbg ("%s: cannot allocate private irq urb per device",
dev->net.name);
kfree (priv);
@@ -1589,7 +1589,7 @@
}
}
- if (!(urb = usb_alloc_urb (0))) {
+ if (!(urb = usb_alloc_urb (0, GFP_ATOMIC))) {
dbg ("no urb");
goto drop;
}
@@ -1723,7 +1723,7 @@
struct urb *urb;
int i;
for (i = 0; i < 3 && dev->rxq.qlen < RX_QLEN; i++) {
- if ((urb = usb_alloc_urb (0)) != 0)
+ if ((urb = usb_alloc_urb (0, GFP_ATOMIC)) != 0)
rx_submit (dev, urb, GFP_ATOMIC);
}
if (temp != dev->rxq.qlen)
--- usbvideo.c.p Fri Feb 8 15:59:23 2002
+++ usbvideo.c Sat Feb 9 11:19:32 2002
@@ -1073,7 +1073,7 @@
down(&uvd->lock);
for (i=0; i < USBVIDEO_NUMSBUF; i++) {
- uvd->sbuf[i].urb = usb_alloc_urb(FRAMES_PER_DESC);
+ uvd->sbuf[i].urb = usb_alloc_urb(FRAMES_PER_DESC, GFP_KERNEL);
if (uvd->sbuf[i].urb == NULL) {
err("usb_alloc_urb(%d.) failed.", FRAMES_PER_DESC);
uvd->uvd_used = 0;
--- vicam.c.p Fri Feb 8 15:59:23 2002
+++ vicam.c Sat Feb 9 11:20:35 2002
@@ -884,7 +884,7 @@
}
memset(vicam, 0, sizeof(*vicam));
- vicam->readurb = usb_alloc_urb(0);
+ vicam->readurb = usb_alloc_urb(0, GFP_KERNEL);
if (!vicam->readurb) {
kfree(vicam);
return NULL;
--- wacom.c.p Fri Feb 8 15:59:23 2002
+++ wacom.c Sat Feb 9 11:21:26 2002
@@ -358,7 +358,7 @@
if (!(wacom = kmalloc(sizeof(struct wacom), GFP_KERNEL))) return NULL;
memset(wacom, 0, sizeof(struct wacom));
- wacom->irq = usb_alloc_urb(0);
+ wacom->irq = usb_alloc_urb(0, GFP_KERNEL);
if (!wacom->irq) {
kfree(wacom);
return NULL;
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
