Commit 9b896033 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: fix accidental LOCKDEP breakage caused by local_irq_set() removal 



commit 54cc1428 ("ide: remove
local_irq_set() macro") accidentally replaced local_save_flags()
by local_irq_set() in ide_probe_port() and __ide_wait_stat()
which resulted in LOCKDEP breakage.

Reported-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Tested-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent a6525042

drivers/ide/ide-iops.c

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad, unsigned long ti 
	stat = tp_ops->read_status(hwif);



	if (stat & ATA_BUSY) {

		local_irq_save(flags);

		local_save_flags(flags);

		local_irq_enable_in_hardirq();

		timeout += jiffies;

		while ((stat = tp_ops->read_status(hwif)) & ATA_BUSY) {

drivers/ide/ide-probe.c

+1 −1
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ static int ide_probe_port(ide_hwif_t *hwif) 
	if (irqd)

		disable_irq(hwif->irq);



	local_irq_save(flags);

	local_save_flags(flags);

	local_irq_enable_in_hardirq();



	if (ide_port_wait_ready(hwif) == -EBUSY)

CRA Git | Maintained and supported by SUSTech CRA and CCSE