mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
ide: skip probing port if "hdx=noprobe" was used for both devices on it
* Skip probing port if "hdx=noprobe" parameter was used for both devices on it. * Obsolete "idex=noprobe" parameter - it only works for ide_generic, cmd640 and PCI hosts in Compatibility mode (on alpha/x86/ia64/m32r/mips/ppc32). Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
This commit is contained in:
parent
cbd34d00af
commit
c53ea18dc2
4 changed files with 5 additions and 5 deletions
|
|
@ -756,7 +756,8 @@ static int ide_probe_port(ide_hwif_t *hwif)
|
|||
|
||||
BUG_ON(hwif->present);
|
||||
|
||||
if (hwif->noprobe)
|
||||
if (hwif->noprobe ||
|
||||
(hwif->drives[0].noprobe && hwif->drives[1].noprobe))
|
||||
return -EACCES;
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1444,7 +1444,7 @@ static int __init ide_setup(char *s)
|
|||
|
||||
case -1: /* "noprobe" */
|
||||
hwif->noprobe = 1;
|
||||
goto done;
|
||||
goto obsolete_option;
|
||||
|
||||
case 1: /* base */
|
||||
vals[1] = vals[0] + 0x206; /* default ctl */
|
||||
|
|
|
|||
|
|
@ -787,7 +787,8 @@ static int __init cmd640x_init(void)
|
|||
/*
|
||||
* Try to enable the secondary interface, if not already enabled
|
||||
*/
|
||||
if (cmd_hwif1->noprobe) {
|
||||
if (cmd_hwif1->noprobe ||
|
||||
(cmd_hwif1->drives[0].noprobe && cmd_hwif1->drives[1].noprobe)) {
|
||||
port2 = "not probed";
|
||||
} else {
|
||||
b = get_cmd640_reg(CNTRL);
|
||||
|
|
|
|||
Loading…
Reference in a new issue