bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tty-write-6.6' into 'master' 

tty/module.c: fix prototype of ec_tty_write for >= 6.6

See merge request etherlab.org/ethercat!103
This commit is contained in:
Florian Pose 2024-01-08 09:06:53 +00:00
parent a79632cdcd 70f54841a4
commit 420e6150f5
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tty/module.c
View File

@ -496,17 +496,26 @@ static void ec_tty_close(struct tty_struct *tty, struct file *file)
/*****************************************************************************/
static int ec_tty_write(
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 0)
static ssize_t
#else
static int
#endif
ec_tty_write(
struct tty_struct *tty,
const unsigned char *buffer,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 0)
size_t count
#else
int count
#endif
)
{
ec_tty_t *t = (ec_tty_t *) tty->driver_data;
unsigned int data_size, i;
#if EC_TTY_DEBUG >= 1
printk(KERN_INFO PFX "%s(count=%i)\n", __func__, count);
printk(KERN_INFO PFX "%s(count=%i)\n", __func__, (int)count);
#endif
if (count <= 0) {