git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
serial
/
8250_pci.c
diff --git
a/drivers/serial/8250_pci.c
b/drivers/serial/8250_pci.c
index
3b3427e
..
34b3677
100644
(file)
--- a/
drivers/serial/8250_pci.c
+++ b/
drivers/serial/8250_pci.c
@@
-497,7
+497,7
@@
static struct timedia_struct {
{ 2, timedia_dual_port },
{ 4, timedia_quad_port },
{ 8, timedia_eight_port },
{ 2, timedia_dual_port },
{ 4, timedia_quad_port },
{ 8, timedia_eight_port },
- { 0,
0
}
+ { 0,
NULL
}
};
static int __devinit pci_timedia_init(struct pci_dev *dev)
};
static int __devinit pci_timedia_init(struct pci_dev *dev)
@@
-574,8
+574,7
@@
titan_400l_800l_setup(struct pci_dev *dev, struct pci_board *board,
static int __devinit pci_xircom_init(struct pci_dev *dev)
{
static int __devinit pci_xircom_init(struct pci_dev *dev)
{
- __set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(HZ/10);
+ msleep(100);
return 0;
}
return 0;
}
@@
-1665,7
+1664,7
@@
pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
for (i = 0; i < nr_ports; i++) {
memset(&serial_req, 0, sizeof(serial_req));
serial_req.flags = UPF_SKIP_TEST | UPF_AUTOPROBE |
for (i = 0; i < nr_ports; i++) {
memset(&serial_req, 0, sizeof(serial_req));
serial_req.flags = UPF_SKIP_TEST | UPF_AUTOPROBE |
- UPF_
RESOURCES | UPF_
SHARE_IRQ;
+ UPF_SHARE_IRQ;
serial_req.baud_base = board->base_baud;
serial_req.irq = get_pci_irq(dev, board, i);
if (quirk->setup(dev, board, &serial_req, i))
serial_req.baud_base = board->base_baud;
serial_req.irq = get_pci_irq(dev, board, i);
if (quirk->setup(dev, board, &serial_req, i))