tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge master.kernel.org:/home/rmk/linux-2.6-serial

Linus Torvalds 2149bcab 2333f212

+16 -8
+5 -8
drivers/serial/8250.c
··· 2595 2595 if (ret) 2596 2596 goto out; 2597 2597 2598 - ret = platform_driver_register(&serial8250_isa_driver); 2599 - if (ret) 2600 - goto unreg_uart_drv; 2601 - 2602 2598 serial8250_isa_devs = platform_device_alloc("serial8250", 2603 2599 PLAT8250_DEV_LEGACY); 2604 2600 if (!serial8250_isa_devs) { 2605 2601 ret = -ENOMEM; 2606 - goto unreg_plat_drv; 2602 + goto unreg_uart_drv; 2607 2603 } 2608 2604 2609 2605 ret = platform_device_add(serial8250_isa_devs); ··· 2608 2612 2609 2613 serial8250_register_ports(&serial8250_reg, &serial8250_isa_devs->dev); 2610 2614 2611 - goto out; 2615 + ret = platform_driver_register(&serial8250_isa_driver); 2616 + if (ret == 0) 2617 + goto out; 2612 2618 2619 + platform_device_del(serial8250_isa_devs); 2613 2620 put_dev: 2614 2621 platform_device_put(serial8250_isa_devs); 2615 - unreg_plat_drv: 2616 - platform_driver_unregister(&serial8250_isa_driver); 2617 2622 unreg_uart_drv: 2618 2623 uart_unregister_driver(&serial8250_reg); 2619 2624 out:
+10
drivers/serial/8250_pci.c
··· 940 940 pbn_b2_bt_2_921600, 941 941 pbn_b2_bt_4_921600, 942 942 943 + pbn_b3_2_115200, 943 944 pbn_b3_4_115200, 944 945 pbn_b3_8_115200, 945 946 ··· 1312 1311 .uart_offset = 8, 1313 1312 }, 1314 1313 1314 + [pbn_b3_2_115200] = { 1315 + .flags = FL_BASE3, 1316 + .num_ports = 2, 1317 + .base_baud = 115200, 1318 + .uart_offset = 8, 1319 + }, 1315 1320 [pbn_b3_4_115200] = { 1316 1321 .flags = FL_BASE3, 1317 1322 .num_ports = 4, ··· 2279 2272 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2280 2273 pbn_nec_nile4 }, 2281 2274 2275 + { PCI_VENDOR_ID_DCI, PCI_DEVICE_ID_DCI_PCCOM2, 2276 + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2277 + pbn_b3_2_115200 }, 2282 2278 { PCI_VENDOR_ID_DCI, PCI_DEVICE_ID_DCI_PCCOM4, 2283 2279 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2284 2280 pbn_b3_4_115200 },
+1
include/linux/pci_ids.h
··· 1992 1992 #define PCI_VENDOR_ID_DCI 0x6666 1993 1993 #define PCI_DEVICE_ID_DCI_PCCOM4 0x0001 1994 1994 #define PCI_DEVICE_ID_DCI_PCCOM8 0x0002 1995 + #define PCI_DEVICE_ID_DCI_PCCOM2 0x0004 1995 1996 1996 1997 #define PCI_VENDOR_ID_INTEL 0x8086 1997 1998 #define PCI_DEVICE_ID_INTEL_EESSC 0x0008