diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /drivers/md/linear.c | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'drivers/md/linear.c')
| -rw-r--r-- | drivers/md/linear.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/linear.c b/drivers/md/linear.c index 0b8511776b3e..10748240cb2f 100644 --- a/drivers/md/linear.c +++ b/drivers/md/linear.c | |||
| @@ -250,6 +250,7 @@ static int linear_run (mddev_t *mddev) | |||
| 250 | { | 250 | { |
| 251 | linear_conf_t *conf; | 251 | linear_conf_t *conf; |
| 252 | 252 | ||
| 253 | mddev->queue->queue_lock = &mddev->queue->__queue_lock; | ||
| 253 | conf = linear_conf(mddev, mddev->raid_disks); | 254 | conf = linear_conf(mddev, mddev->raid_disks); |
| 254 | 255 | ||
| 255 | if (!conf) | 256 | if (!conf) |