diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-20 22:27:00 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-20 22:27:00 (GMT) |
commit | e177bb587ea0fade3d9a86f6667da8d89bea3607 (patch) | |
tree | daebf1786d014cc3182137c76e02381d0aceb245 /drivers | |
parent | 55529fa5762462beb39f913c5277cb96c7be0858 (diff) | |
parent | 561839598e61f03c9175183ea066b2b7fa58ce85 (diff) | |
download | linux-e177bb587ea0fade3d9a86f6667da8d89bea3607.tar.xz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k update from Geert Uytterhoeven.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA
swim: Add missing spinlock init
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/block/swim.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/swim.c b/drivers/block/swim.c index 765fa2b..8766a22 100644 --- a/drivers/block/swim.c +++ b/drivers/block/swim.c @@ -844,6 +844,7 @@ static int swim_floppy_init(struct swim_priv *swd) swd->unit[drive].swd = swd; } + spin_lock_init(&swd->lock); swd->queue = blk_init_queue(do_fd_request, &swd->lock); if (!swd->queue) { err = -ENOMEM; |