diff -rupN old/drivers/scsi/megaraid/megaraid_sas.c new/drivers/scsi/megaraid/megaraid_sas.c --- old/drivers/scsi/megaraid/megaraid_sas.c 2010-11-17 13:46:11.000000000 -0500 +++ new/drivers/scsi/megaraid/megaraid_sas.c 2010-11-17 13:47:46.000000000 -0500 @@ -108,6 +108,7 @@ static struct megasas_mgmt_info megasas_ static struct fasync_struct *megasas_async_queue; static DEFINE_MUTEX(megasas_async_queue_mutex); +static struct workqueue_struct *megasas_ocr_wq; static int megasas_poll_wait_aen; static DECLARE_WAIT_QUEUE_HEAD(megasas_poll_wait); static u32 support_poll_for_event; @@ -2435,7 +2436,7 @@ megasas_deplete_reply_queue(struct megas printk(KERN_NOTICE "megasas: fwState=%x, stage:%d\n", fw_state, instance->adprecovery); - schedule_work(&instance->work_init); + queue_work(megasas_ocr_wq, &instance->work_init); return IRQ_HANDLED; } else { @@ -5157,6 +5158,11 @@ static int __init megasas_init(void) goto err_pcidrv; } + megasas_ocr_wq = create_workqueue("megasas_ocr"); + + if ( !megasas_ocr_wq ) + printk(KERN_DEBUG "megasas: Failed to create workqueue.\n"); + rval = driver_create_file(&megasas_pci_driver.driver, &driver_attr_version); if (rval) @@ -5228,6 +5234,11 @@ static void __exit megasas_exit(void) &driver_attr_release_date); driver_remove_file(&megasas_pci_driver.driver, &driver_attr_version); + if (megasas_ocr_wq) { + destroy_workqueue(megasas_ocr_wq); + megasas_ocr_wq = NULL; + } + pci_unregister_driver(&megasas_pci_driver); unregister_chrdev(megasas_mgmt_majorno, "megaraid_sas_ioctl"); }