Prev: [117/145] USB: xhci: Fix finding extended capabilities registers
Next: [105/145] sunxvr500: Additional PCI id for sunxvr500 driver
From: Greg KH on 12 Mar 2010 19:40 2.6.32-stable review patch. If anyone has any objections, please let me know. ---------------- From: Guennadi Liakhovetski <g.liakhovetski(a)gmx.de> commit b857df1acc634b18db1db2a40864af985100266e upstream. mod_timer() takes an absolute time and not a delay as its argument. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski(a)gmx.de> Signed-off-by: Russell King <rmk+kernel(a)arm.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- drivers/scsi/arm/fas216.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/scsi/arm/fas216.c +++ b/drivers/scsi/arm/fas216.c @@ -2516,7 +2516,7 @@ int fas216_eh_device_reset(struct scsi_c if (info->scsi.phase == PHASE_IDLE) fas216_kick(info); - mod_timer(&info->eh_timer, 30 * HZ); + mod_timer(&info->eh_timer, jiffies + 30 * HZ); spin_unlock_irqrestore(&info->host_lock, flags); /* -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |