diff options
Diffstat (limited to 'arch/cris/arch-v32/drivers')
-rw-r--r-- | arch/cris/arch-v32/drivers/Kconfig | 8 | ||||
-rw-r--r-- | arch/cris/arch-v32/drivers/cryptocop.c | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig index a33097f95362..f64624fc4504 100644 --- a/arch/cris/arch-v32/drivers/Kconfig +++ b/arch/cris/arch-v32/drivers/Kconfig | |||
@@ -88,7 +88,7 @@ config ETRAX_SERIAL_PORT0_DMA7_IN | |||
88 | help | 88 | help |
89 | Enables the DMA7 input channel for ser0 (ttyS0). | 89 | Enables the DMA7 input channel for ser0 (ttyS0). |
90 | If you do not enable DMA, an interrupt for each character will be | 90 | If you do not enable DMA, an interrupt for each character will be |
91 | used when receiveing data. | 91 | used when receiving data. |
92 | Normally you want to use DMA, unless you use the DMA channel for | 92 | Normally you want to use DMA, unless you use the DMA channel for |
93 | something else. | 93 | something else. |
94 | 94 | ||
@@ -157,7 +157,7 @@ config ETRAX_SERIAL_PORT1_DMA5_IN | |||
157 | help | 157 | help |
158 | Enables the DMA5 input channel for ser1 (ttyS1). | 158 | Enables the DMA5 input channel for ser1 (ttyS1). |
159 | If you do not enable DMA, an interrupt for each character will be | 159 | If you do not enable DMA, an interrupt for each character will be |
160 | used when receiveing data. | 160 | used when receiving data. |
161 | Normally you want this on, unless you use the DMA channel for | 161 | Normally you want this on, unless you use the DMA channel for |
162 | something else. | 162 | something else. |
163 | 163 | ||
@@ -228,7 +228,7 @@ config ETRAX_SERIAL_PORT2_DMA3_IN | |||
228 | help | 228 | help |
229 | Enables the DMA3 input channel for ser2 (ttyS2). | 229 | Enables the DMA3 input channel for ser2 (ttyS2). |
230 | If you do not enable DMA, an interrupt for each character will be | 230 | If you do not enable DMA, an interrupt for each character will be |
231 | used when receiveing data. | 231 | used when receiving data. |
232 | Normally you want to use DMA, unless you use the DMA channel for | 232 | Normally you want to use DMA, unless you use the DMA channel for |
233 | something else. | 233 | something else. |
234 | 234 | ||
@@ -297,7 +297,7 @@ config ETRAX_SERIAL_PORT3_DMA9_IN | |||
297 | help | 297 | help |
298 | Enables the DMA9 input channel for ser3 (ttyS3). | 298 | Enables the DMA9 input channel for ser3 (ttyS3). |
299 | If you do not enable DMA, an interrupt for each character will be | 299 | If you do not enable DMA, an interrupt for each character will be |
300 | used when receiveing data. | 300 | used when receiving data. |
301 | Normally you want to use DMA, unless you use the DMA channel for | 301 | Normally you want to use DMA, unless you use the DMA channel for |
302 | something else. | 302 | something else. |
303 | 303 | ||
diff --git a/arch/cris/arch-v32/drivers/cryptocop.c b/arch/cris/arch-v32/drivers/cryptocop.c index ba096ebb0b15..2449637e6fc0 100644 --- a/arch/cris/arch-v32/drivers/cryptocop.c +++ b/arch/cris/arch-v32/drivers/cryptocop.c | |||
@@ -2051,7 +2051,6 @@ static void cryptocop_job_queue_close(void) | |||
2051 | spin_lock_irqsave(&cryptocop_process_lock, process_flags); | 2051 | spin_lock_irqsave(&cryptocop_process_lock, process_flags); |
2052 | 2052 | ||
2053 | /* Empty the job queue. */ | 2053 | /* Empty the job queue. */ |
2054 | spin_lock_irqsave(&cryptocop_process_lock, process_flags); | ||
2055 | for (i = 0; i < cryptocop_prio_no_prios; i++){ | 2054 | for (i = 0; i < cryptocop_prio_no_prios; i++){ |
2056 | if (!list_empty(&(cryptocop_job_queues[i].jobs))){ | 2055 | if (!list_empty(&(cryptocop_job_queues[i].jobs))){ |
2057 | list_for_each_safe(node, tmp, &(cryptocop_job_queues[i].jobs)) { | 2056 | list_for_each_safe(node, tmp, &(cryptocop_job_queues[i].jobs)) { |