summaryrefslogtreecommitdiff
path: root/linux/dev
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2015-06-30 00:30:26 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2015-06-30 00:30:26 +0200
commita6b89d0dadce72ddf0e029999b968d611225d87f (patch)
tree1857134f32e9cfc4f47a380de92ebb0d2037f891 /linux/dev
parent9df8dabddf63500e478ec449d022881643255cf2 (diff)
Fix restoring interrupts on timeout
* linux/dev/drivers/block/ahci.c (ahci_identify): Restore flags before returning on timeout.
Diffstat (limited to 'linux/dev')
-rw-r--r--linux/dev/drivers/block/ahci.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/dev/drivers/block/ahci.c b/linux/dev/drivers/block/ahci.c
index 58105a7..9bb2e6b 100644
--- a/linux/dev/drivers/block/ahci.c
+++ b/linux/dev/drivers/block/ahci.c
@@ -638,6 +638,7 @@ static int ahci_identify(const volatile struct ahci_host *ahci_host, const volat
port->ahci_host = NULL;
port->ahci_port = NULL;
del_timer(&identify_timer);
+ restore_flags(flags);
return 3;
}
sleep_on(&port->q);