thunderbolt: merge fix for kunix_resource changes

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/thunderbolt/test.c b/drivers/thunderbolt/test.c
index acb8b62568471b3ecb5d05ef550d7611232e2a17..a4d78811f7e20bfaaab69310efa69c73775237bf 100644 (file)
--- a/drivers/thunderbolt/test.c
+++ b/drivers/thunderbolt/test.c
@@ -17,13 +17,13 @@ static int __ida_init(struct kunit_resource *res, void *context)
        struct ida *ida = context;
 
        ida_init(ida);
-       res->allocation = ida;
+       res->data = ida;
        return 0;
 }
 
 static void __ida_destroy(struct kunit_resource *res)
 {
-       struct ida *ida = res->allocation;
+       struct ida *ida = res->data;
 
        ida_destroy(ida);
 }