Signed-off-by: Andrew Morton --- drivers/ide/ide-probe.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff -puN drivers/ide/ide-probe.c~ide-mm-ide-add-hwif-chipset-fixup-to-ide_device_add drivers/ide/ide-probe.c --- a/drivers/ide/ide-probe.c~ide-mm-ide-add-hwif-chipset-fixup-to-ide_device_add +++ a/drivers/ide/ide-probe.c @@ -1405,8 +1405,12 @@ int ide_device_add(u8 idx[4]) hwif = &ide_hwifs[idx[i]]; - if (hwif->present) + if (hwif->present) { + if (hwif->chipset == ide_unknown || + hwif->chipset == ide_forced) + hwif->chipset = ide_generic; hwif_register_devices(hwif); + } } for (i = 0; i < 4; i++) { _