Merge branch 'linux-2.6' into for-linus

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 1250f0eab4af..7492d6033ac6 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1470,8 +1470,8 @@ static void fix_read_error(conf_t *conf, mddev_t *mddev, r10bio_t *r10_bio)
                                                "raid10:%s: read error corrected"
                                                " (%d sectors at %llu on %s)\n",
                                                mdname(mddev), s,
-                                               (unsigned long long)sect+
-                                                    rdev->data_offset,
+                                               (unsigned long long)(sect+
+                                                    rdev->data_offset),
                                                bdevname(rdev->bdev, b));
 
                                 rdev_dec_pending(rdev, mddev);
@@ -2079,7 +2079,7 @@ static int run(mddev_t *mddev)
                 disk = conf->mirrors + i;
 
                 if (!disk->rdev ||
-                    !test_bit(In_sync, &rdev->flags)) {
+                    !test_bit(In_sync, &disk->rdev->flags)) {
                         disk->head_position = 0;
                         mddev->degraded++;
                 }