Commit 71fa1a44 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds

thunderbolt: merge fix for kunix_resource changes

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 06a81c1c
...@@ -17,13 +17,13 @@ static int __ida_init(struct kunit_resource *res, void *context) ...@@ -17,13 +17,13 @@ static int __ida_init(struct kunit_resource *res, void *context)
struct ida *ida = context; struct ida *ida = context;
ida_init(ida); ida_init(ida);
res->allocation = ida; res->data = ida;
return 0; return 0;
} }
static void __ida_destroy(struct kunit_resource *res) static void __ida_destroy(struct kunit_resource *res)
{ {
struct ida *ida = res->allocation; struct ida *ida = res->data;
ida_destroy(ida); ida_destroy(ida);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment