diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-11-19 21:25:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-19 21:25:27 +0100 |
| commit | 87af0b80c933f05a4c7dd8c5edebe10365e76220 (patch) | |
| tree | 6c33ab1a47b5f1ef196e8847586fb81b17152a0e /drivers/md/faulty.c | |
| parent | 08a978db518dfceb37998bc74a7fed03540cfd08 (diff) | |
| parent | 2ea3c6a2c779e5a6487d2b436770232162dfbbe3 (diff) | |
| download | blackbird-op-linux-87af0b80c933f05a4c7dd8c5edebe10365e76220.tar.gz blackbird-op-linux-87af0b80c933f05a4c7dd8c5edebe10365e76220.zip | |
Merge branch 'for-linus' into for-next
Merge the recent HD-audio codec change for fixing recursive suspend
calls.
Conflicts:
sound/pci/hda/hda_codec.c
Diffstat (limited to 'drivers/md/faulty.c')
| -rw-r--r-- | drivers/md/faulty.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/md/faulty.c b/drivers/md/faulty.c index 45135f69509c..5e7dc772f5de 100644 --- a/drivers/md/faulty.c +++ b/drivers/md/faulty.c @@ -315,8 +315,11 @@ static int run(struct mddev *mddev) } conf->nfaults = 0; - rdev_for_each(rdev, mddev) + rdev_for_each(rdev, mddev) { conf->rdev = rdev; + disk_stack_limits(mddev->gendisk, rdev->bdev, + rdev->data_offset << 9); + } md_set_array_sectors(mddev, faulty_size(mddev, 0, 0)); mddev->private = conf; |
