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

Commit e0c6dcd8 authored by Roel Kluin's avatar Roel Kluin Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: expiry() returns int, negative expiry() return values won't be noticed 



bart:
It seems like the bug could cause insanely long timeouts for:
- ATA_DMA_ERR error in dma_timer_expiry()
- commands without ->expiry in tc86c001_timer_expiry()
  (TC86C001 IDE controller only)

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
[bart: port it to the current tree]
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent fec6c6fe

drivers/ide/ide-io.c

+1 −1
Original line number Diff line number Diff line
@@ -908,7 +908,7 @@ void ide_timer_expiry (unsigned long data) 
	ide_drive_t	*uninitialized_var(drive);

	ide_handler_t	*handler;

	unsigned long	flags;

	unsigned long	wait = -1;

	int		wait = -1;

	int		plug_device = 0;



	spin_lock_irqsave(&hwif->lock, flags);