Commit 3ae14d9d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 77ce71aa ("i2c: designware: Add disabling clocks when probe fails")... 


Merge 77ce71aa ("i2c: designware: Add disabling clocks when probe fails") into android14-6.1-lts

Steps on the way to 6.1.156

Resolves merge conflicts in:
	drivers/i3c/master/svc-i3c-master.c

Change-Id: I5b2e17dc3239b09da198c4e83dc6e3a14dec6a94
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 6f6441d9 77ce71aa
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment