aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2009-05-31 02:43:58 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 14:00:55 -0400
commit8d1c50e9829442be5bc88979d587af2a5ff07e32 (patch)
tree7317485e181e29cbf3370ad2df9fba2ab846fbea /drivers/staging
parentad914a3ec5f1b8c4f97a00f94e11bb20f99a901b (diff)
Staging: heci: do not print error when heci_bh_handler is already on workqueue
schedule_work returns 0, if the work is already on the work_queue, else returns non-zero. Do not print error message if heci_bh_handlerwork was already on queue. Signed-off-by: Nikanth Karthikesan <knikanth@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/heci/interrupt.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/staging/heci/interrupt.c b/drivers/staging/heci/interrupt.c
index 3a510ed3a3d..2a3a01a62bb 100644
--- a/drivers/staging/heci/interrupt.c
+++ b/drivers/staging/heci/interrupt.c
@@ -103,10 +103,8 @@ irqreturn_t heci_isr_interrupt(int irq, void *dev_id)
103 PREPARE_WORK(&dev->work, heci_bh_handler); 103 PREPARE_WORK(&dev->work, heci_bh_handler);
104 DBG("schedule work the heci_bh_handler.\n"); 104 DBG("schedule work the heci_bh_handler.\n");
105 err = schedule_work(&dev->work); 105 err = schedule_work(&dev->work);
106 if (!err) { 106 if (!err)
107 printk(KERN_ERR "heci: schedule the heci_bh_handler" 107 DBG("heci_bh_handler was already on the workqueue.\n");
108 " failed error=%x\n", err);
109 }
110 return IRQ_HANDLED; 108 return IRQ_HANDLED;
111} 109}
112 110
@@ -260,10 +258,8 @@ end:
260 PREPARE_WORK(&dev->work, heci_bh_handler); 258 PREPARE_WORK(&dev->work, heci_bh_handler);
261 DBG("schedule work the heci_bh_handler.\n"); 259 DBG("schedule work the heci_bh_handler.\n");
262 rets = schedule_work(&dev->work); 260 rets = schedule_work(&dev->work);
263 if (!rets) { 261 if (!rets)
264 printk(KERN_ERR "heci: schedule the heci_bh_handler" 262 DBG("heci_bh_handler was already queued.\n");
265 " failed error=%x\n", rets);
266 }
267 } else { 263 } else {
268 heci_csr_enable_interrupts(dev); 264 heci_csr_enable_interrupts(dev);
269 } 265 }