diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-18 15:36:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-18 15:36:06 -0500 |
| commit | bc3adfc6703edfd2484902b5391092c717076f87 (patch) | |
| tree | 9df3b216990f6b321095bcc6c35444f5e0d8165c /drivers/mtd/nand/r852.c | |
| parent | 3c18d4de86e4a7f93815c081e50e0543fa27200f (diff) | |
| parent | 3233cdbd9fa347a6d6897a94cc6ed0302ae83c4f (diff) | |
Merge branch 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
* 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: make sure MAYDAY_INITIAL_TIMEOUT is at least 2 jiffies long
workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'
workqueue: wake up a worker when a rescuer is leaving a gcwq
Diffstat (limited to 'drivers/mtd/nand/r852.c')
| -rw-r--r-- | drivers/mtd/nand/r852.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c index d9d7efbc77cc..6322d1fb5d62 100644 --- a/drivers/mtd/nand/r852.c +++ b/drivers/mtd/nand/r852.c | |||
| @@ -930,7 +930,7 @@ int r852_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) | |||
| 930 | 930 | ||
| 931 | init_completion(&dev->dma_done); | 931 | init_completion(&dev->dma_done); |
| 932 | 932 | ||
| 933 | dev->card_workqueue = create_freezeable_workqueue(DRV_NAME); | 933 | dev->card_workqueue = create_freezable_workqueue(DRV_NAME); |
| 934 | 934 | ||
| 935 | if (!dev->card_workqueue) | 935 | if (!dev->card_workqueue) |
| 936 | goto error9; | 936 | goto error9; |