Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d684b21f authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

falconide: locking bugfix 



commit 8ac4ce74 ("ide: fix host drivers
depending on ide_generic to probe for interfaces (take 2)") moved probing
to falconide but forgot to take care of Atari specific locking - fix it.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitz@debian.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent ef709165

drivers/ide/ide-generic.c

+0 −6
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ static int __init ide_generic_init(void) 
	u8 idx[MAX_HWIFS];

	int i;



	if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])

		ide_get_lock(NULL, NULL); /* for atari only */



	for (i = 0; i < MAX_HWIFS; i++) {

		ide_hwif_t *hwif = &ide_hwifs[i];
@@ -31,9 +28,6 @@ static int __init ide_generic_init(void) 


	ide_device_add_all(idx, NULL);



	if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])

		ide_release_lock();	/* for atari only */



	return 0;

}

drivers/ide/legacy/falconide.c

+2 −0
Original line number Diff line number Diff line
@@ -84,7 +84,9 @@ static int __init falconide_init(void) 
		ide_init_port_data(hwif, index);

		ide_init_port_hw(hwif, &hw);



		ide_get_lock(NULL, NULL);

		ide_device_add(idx, NULL);

		ide_release_lock();

	}



	return 0;