From 2a800b7bd926c739c07c1690579f03bbd6f1b5a3 Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Sun, 18 Jul 2010 16:11:06 -0700 Subject: via82cxxx: fix typo for VT6415 PCIE PATA IDE Host Controller support. Without this fix, init of the via82cxxx driver causes a oops with a stack resembling the one below, and the boot blocks between init of USB devices and launch of init (was easy to bisect by booting with init=/bin/sh). Pid: 279, comm: work_for_cpu Not tainted 2.6.34.1-00003-ga42ea77 #2 Call Trace: [] ? warn_slowpath_common+0x76/0x8c [] ? warn_slowpath_fmt+0x40/0x45 [] ? printk+0x40/0x47 [] ? enable_irq+0x3e/0x64 [] ? ide_probe_port+0x55c/0x589 [ide_core] [] ? ide_host_register+0x273/0x628 [ide_core] [] ? ide_pci_init_two+0x4da/0x5c5 [ide_core] [] ? up+0xe/0x36 [] ? release_console_sem+0x17e/0x1ae [] ? klist_iter_exit+0x14/0x1e [] ? bus_find_device+0x75/0x83 [] ? via_init_one+0x269/0x28a [via82cxxx] [] ? init_chipset_via82cxxx+0x0/0x1ea [via82cxxx] [] ? do_work_for_cpu+0x0/0x1b [] ? local_pci_probe+0x12/0x16 [] ? do_work_for_cpu+0xb/0x1b [] ? kthread+0x75/0x7d [] ? kernel_thread_helper+0x4/0x10 [] ? kthread+0x0/0x7d [] ? kernel_thread_helper+0x0/0x10 ---[ end trace 89c8cb70379b5bda ]--- The typo was introduced in a354ae8747d0687093ce244e76b15b6174d2f098, and affects 2.6.33-rc4 and later. Signed-off-by: Yann Dirson Signed-off-by: David S. Miller --- drivers/ide/via82cxxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/ide') diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c index 101f4002238..d2a0997b78f 100644 --- a/drivers/ide/via82cxxx.c +++ b/drivers/ide/via82cxxx.c @@ -79,7 +79,7 @@ static struct via_isa_bridge { { "vt8261", PCI_DEVICE_ID_VIA_8261, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST }, { "vt8237s", PCI_DEVICE_ID_VIA_8237S, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST }, { "vt6410", PCI_DEVICE_ID_VIA_6410, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST }, - { "vt6415", PCI_DEVICE_ID_VIA_6410, 0x00, 0xff, ATA_UDMA6, VIA_BAD_AST }, + { "vt6415", PCI_DEVICE_ID_VIA_6415, 0x00, 0xff, ATA_UDMA6, VIA_BAD_AST }, { "vt8251", PCI_DEVICE_ID_VIA_8251, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST }, { "vt8237", PCI_DEVICE_ID_VIA_8237, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST }, { "vt8237a", PCI_DEVICE_ID_VIA_8237A, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST }, -- cgit v1.2.3-70-g09d2