From: Stephen Rothwell <sfr@canb.auug.org.au>

Date: Tue, 30 Jun 2020 15:51:50 +1000

Subject: thunderbolt: merge fix for kunix_resource changes

Git-commit: 71fa1a4489ff93ac4acd7e6c5b00098ba53a4485

Patch-mainline: v5.9-rc1

References: jsc#SLE-14130

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Acked-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>

---

 drivers/thunderbolt/test.c | 4 ++--

 1 file 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);

 }