diff options
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas_base.c')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_base.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 5d6d07bd1cd0..e7c9b41def7b 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c | |||
| @@ -4242,9 +4242,8 @@ megasas_suspend(struct pci_dev *pdev, pm_message_t state) | |||
| 4242 | /* cancel the delayed work if this work still in queue */ | 4242 | /* cancel the delayed work if this work still in queue */ |
| 4243 | if (instance->ev != NULL) { | 4243 | if (instance->ev != NULL) { |
| 4244 | struct megasas_aen_event *ev = instance->ev; | 4244 | struct megasas_aen_event *ev = instance->ev; |
| 4245 | cancel_delayed_work( | 4245 | cancel_delayed_work_sync( |
| 4246 | (struct delayed_work *)&ev->hotplug_work); | 4246 | (struct delayed_work *)&ev->hotplug_work); |
| 4247 | flush_scheduled_work(); | ||
| 4248 | instance->ev = NULL; | 4247 | instance->ev = NULL; |
| 4249 | } | 4248 | } |
| 4250 | 4249 | ||
| @@ -4417,9 +4416,8 @@ static void __devexit megasas_detach_one(struct pci_dev *pdev) | |||
| 4417 | /* cancel the delayed work if this work still in queue*/ | 4416 | /* cancel the delayed work if this work still in queue*/ |
| 4418 | if (instance->ev != NULL) { | 4417 | if (instance->ev != NULL) { |
| 4419 | struct megasas_aen_event *ev = instance->ev; | 4418 | struct megasas_aen_event *ev = instance->ev; |
| 4420 | cancel_delayed_work( | 4419 | cancel_delayed_work_sync( |
| 4421 | (struct delayed_work *)&ev->hotplug_work); | 4420 | (struct delayed_work *)&ev->hotplug_work); |
| 4422 | flush_scheduled_work(); | ||
| 4423 | instance->ev = NULL; | 4421 | instance->ev = NULL; |
| 4424 | } | 4422 | } |
| 4425 | 4423 | ||