UPSTREAM: mmc: core: update mmc.c upstream version

[firefly-linux-kernel-4.4.55.git] / drivers / md / dm-verity-fec.c

diff --git a/drivers/md/dm-verity-fec.c b/drivers/md/dm-verity-fec.c
index b26809a47ca37ddc50fc2df392c51faa92c1b5b6..1dd667b975307ee5928c094a3b045e7a044b887b 100644 (file)
--- a/drivers/md/dm-verity-fec.c
+++ b/drivers/md/dm-verity-fec.c
@@ -463,9 +463,7 @@ int verity_fec_decode(struct dm_verity *v, struct dm_verity_io *io,
         */
 
        offset = block << v->data_dev_block_bits;
-
-       res = offset;
-       div64_u64(res, v->fec->rounds << v->data_dev_block_bits);
+       res = div64_u64(offset, v->fec->rounds << v->data_dev_block_bits);
 
        /*
         * The base RS block we can feed to the interleaver to find out all
@@ -534,6 +532,7 @@ void verity_fec_init_io(struct dm_verity_io *io)
        memset(fio->bufs, 0, sizeof(fio->bufs));
        fio->nbufs = 0;
        fio->output = NULL;
+       fio->level = 0;
 }
 
 /*
@@ -689,7 +688,8 @@ static struct attribute *fec_attrs[] = {
 
 static struct kobj_type fec_ktype = {
        .sysfs_ops = &kobj_sysfs_ops,
-       .default_attrs = fec_attrs
+       .default_attrs = fec_attrs,
+       .release = dm_kobject_release
 };
 
 /*