summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2020-06-30 15:51:50 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2020-08-09 11:06:10 -0700
commit71fa1a4489ff93ac4acd7e6c5b00098ba53a4485 (patch)
treed38102529626cdb71b43f6e1ae872e99aca00f10 /drivers
parent06a81c1c7db9bd5de0bd38cd5acc44bb22b99150 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/thunderbolt/test.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/thunderbolt/test.c b/drivers/thunderbolt/test.c
index acb8b6256847..a4d78811f7e2 100644
--- 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);
}