lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

HiSax: fix error checking for hisax_register()]

Browse Source 
This patch (as875) adds error-checking to the callers of hisax_register().
It also changes an error pathway in that routine, making it return an error
code rather than 0.

This fixes Bugzilla #7960.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Karsten Keil <kkeil@suse.de>
Cc: Martin Bachem <info@colognechip.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Stern
2007-05-23 13:58:12 -07:00
committed by Linus Torvalds
parent 9d9a2000e6
commit ae2d990eed
5 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/isdn/hisax/hfc_usb.c
View File

@@ -485,7 +485,6 @@ fill_isoc_urb(struct urb *urb, struct usb_device *dev, unsigned int pipe,
{
int k;
spin_lock_init(&urb->lock);
urb->dev = dev;
urb->pipe = pipe;
urb->complete = complete;
@@ -578,16 +577,14 @@ stop_isoc_chain(usb_fifo * fifo)
"HFC-S USB: Stopping iso chain for fifo %i.%i",
fifo->fifonum, i);
#endif
usb_unlink_urb(fifo->iso[i].purb);
usb_kill_urb(fifo->iso[i].purb);
usb_free_urb(fifo->iso[i].purb);
fifo->iso[i].purb = NULL;
}
}
if (fifo->urb) {
usb_unlink_urb(fifo->urb);
usb_free_urb(fifo->urb);
fifo->urb = NULL;
}
usb_kill_urb(fifo->urb);
usb_free_urb(fifo->urb);
fifo->urb = NULL;
fifo->active = 0;
}
@@ -1305,7 +1302,11 @@ usb_init(hfcusb_data * hfc)
}
/* default Prot: EURO ISDN, should be a module_param */
hfc->protocol = 2;
hisax_register(&hfc->d_if, p_b_if, "hfc_usb", hfc->protocol);
i = hisax_register(&hfc->d_if, p_b_if, "hfc_usb", hfc->protocol);
if (i) {
printk(KERN_INFO "HFC-S USB: hisax_register -> %d\n", i);
return i;
}
#ifdef CONFIG_HISAX_DEBUG
hfc_debug = debug;
@@ -1626,11 +1627,9 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
#endif
/* init the chip and register the driver */
if (usb_init(context)) {
if (context->ctrl_urb) {
usb_unlink_urb(context->ctrl_urb);
usb_free_urb(context->ctrl_urb);
context->ctrl_urb = NULL;
}
usb_kill_urb(context->ctrl_urb);
usb_free_urb(context->ctrl_urb);
context->ctrl_urb = NULL;
kfree(context);
return (-EIO);
}
@@ -1682,21 +1681,15 @@ hfc_usb_disconnect(struct usb_interface
i);
#endif
}
if (context->fifos[i].urb) {
usb_unlink_urb(context->fifos[i].urb);
usb_free_urb(context->fifos[i].urb);
context->fifos[i].urb = NULL;
}
usb_kill_urb(context->fifos[i].urb);
usb_free_urb(context->fifos[i].urb);
context->fifos[i].urb = NULL;
}
context->fifos[i].active = 0;
}
/* wait for all URBS to terminate */
mdelay(10);
if (context->ctrl_urb) {
usb_unlink_urb(context->ctrl_urb);
usb_free_urb(context->ctrl_urb);
context->ctrl_urb = NULL;
}
usb_kill_urb(context->ctrl_urb);
usb_free_urb(context->ctrl_urb);
context->ctrl_urb = NULL;
hisax_unregister(&context->d_if);
kfree(context); /* free our structure again */
} /* hfc_usb_disconnect */