Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-09-24 19:13:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-6.4' into 'master'

Browse Source 
Fix class_create on kernel 6.4

See merge request etherlab.org/ethercat!73
This commit is contained in:
Florian Pose
2023-07-05 08:13:02 +00:00
parent 589838526a 262afa2f9c
commit f5dc109176
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devices/ccat/module.c
+4
View File
@@ -71,7 +71,11 @@ static int __init ccat_class_init(struct ccat_class *base)
return -1;
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)
base->class = class_create(THIS_MODULE, base->name);
#else
base->class = class_create(base->name);
#endif
if (!base->class) {
pr_warn("Create device class '%s' failed\n",
base->name);
master/module.c
+4
View File
@@ -112,7 +112,11 @@ int __init ec_init_module(void)
}
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)
class = class_create(THIS_MODULE, "EtherCAT");
#else
class = class_create("EtherCAT");
#endif
if (IS_ERR(class)) {
EC_ERR("Failed to create device class.\n");
ret = PTR_ERR(class);