Skip to content

Commit a11b696

Browse files
committed
Merge tag 'i3c/for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux
Pull i3c updates from Boris Brezillon: "Minor fixes and MAINTAINERS updates" * tag 'i3c/for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux: MAINTAINERS: add myself as maintainer of Cadence I3C master controller driver MAINTAINERS: Mark linux-i3c mailing list moderated i3c: Spelling s/dicovered/discovered/ i3c: master: use i3c_dev_get_master()
2 parents ae2dc03 + ae24f2b commit a11b696

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

MAINTAINERS

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7781,7 +7781,7 @@ F: drivers/i2c/i2c-stub.c
77817781

77827782
I3C SUBSYSTEM
77837783
M: Boris Brezillon <[email protected]>
7784-
7784+
L: [email protected] (moderated for non-subscribers)
77857785
C: irc://chat.freenode.net/linux-i3c
77867786
T: git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git
77877787
S: Maintained
@@ -7797,6 +7797,12 @@ S: Maintained
77977797
F: Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.txt
77987798
F: drivers/i3c/master/dw*
77997799

7800+
I3C DRIVER FOR CADENCE I3C MASTER IP
7801+
M: Przemysław Gaj <[email protected]>
7802+
S: Maintained
7803+
F: Documentation/devicetree/bindings/i3c/cdns,i3c-master.txt
7804+
F: drivers/i3c/master/i3c-master-cdns.c
7805+
78007806
IA64 (Itanium) PLATFORM
78017807
M: Tony Luck <[email protected]>
78027808
M: Fenghua Yu <[email protected]>

drivers/i3c/master.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1763,7 +1763,7 @@ static void i3c_master_bus_cleanup(struct i3c_master_controller *master)
17631763
static struct i3c_dev_desc *
17641764
i3c_master_search_i3c_dev_duplicate(struct i3c_dev_desc *refdev)
17651765
{
1766-
struct i3c_master_controller *master = refdev->common.master;
1766+
struct i3c_master_controller *master = i3c_dev_get_master(refdev);
17671767
struct i3c_dev_desc *i3cdev;
17681768

17691769
i3c_bus_for_each_i3cdev(&master->bus, i3cdev) {
@@ -2493,7 +2493,7 @@ int i3c_master_register(struct i3c_master_controller *master,
24932493

24942494
/*
24952495
* We're done initializing the bus and the controller, we can now
2496-
* register I3C devices dicovered during the initial DAA.
2496+
* register I3C devices discovered during the initial DAA.
24972497
*/
24982498
master->init_done = true;
24992499
i3c_bus_normaluse_lock(&master->bus);

0 commit comments

Comments
 (0)