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

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
ide: Fix ordering of procfs registry.

Linus Torvalds 81cef8e3 7d7dee96

+3 -9
+3 -9
drivers/ide/ide-probe.c
··· 1448 1448 if (hwif == NULL) 1449 1449 continue; 1450 1450 1451 - if (hwif->present) 1452 - hwif_register_devices(hwif); 1453 - } 1454 - 1455 - ide_host_for_each_port(i, hwif, host) { 1456 - if (hwif == NULL) 1457 - continue; 1458 - 1459 1451 ide_sysfs_register_port(hwif); 1460 1452 ide_proc_register_port(hwif); 1461 1453 1462 - if (hwif->present) 1454 + if (hwif->present) { 1463 1455 ide_proc_port_register_devices(hwif); 1456 + hwif_register_devices(hwif); 1457 + } 1464 1458 } 1465 1459 1466 1460 return j ? 0 : -1;