diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:58 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:58 -0400 |
| commit | 9e165acf1b9e37af7c0fa39399b43d0bd8600039 (patch) | |
| tree | 7ffdb0ad4c35ac9c19c4096b4f22ccc9b1eeefad /drivers/media/video/ivtv/ivtv-driver.c | |
| parent | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (diff) | |
| parent | 791ccf2e4deeea8426b389fd0f5bb0e9167bb75d (diff) | |
Merge branch 'at91' into devel
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.c')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index aea1664948ce..4afc7ea07e86 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c | |||
| @@ -688,7 +688,7 @@ static int __devinit ivtv_init_struct1(struct ivtv *itv) | |||
| 688 | spin_lock_init(&itv->lock); | 688 | spin_lock_init(&itv->lock); |
| 689 | spin_lock_init(&itv->dma_reg_lock); | 689 | spin_lock_init(&itv->dma_reg_lock); |
| 690 | 690 | ||
| 691 | itv->irq_work_queues = create_workqueue(itv->name); | 691 | itv->irq_work_queues = create_singlethread_workqueue(itv->name); |
| 692 | if (itv->irq_work_queues == NULL) { | 692 | if (itv->irq_work_queues == NULL) { |
| 693 | IVTV_ERR("Could not create ivtv workqueue\n"); | 693 | IVTV_ERR("Could not create ivtv workqueue\n"); |
| 694 | return -1; | 694 | return -1; |