Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris:
CRIS: Add paths for CRISv10 serial driver
CRIS: Fix RS485 delay handling.
Add missing "struct" to in sizeof.
+16
-8
+1
MAINTAINERS
+1
MAINTAINERS
+15
-8
drivers/serial/crisv10.c
+15
-8
drivers/serial/crisv10.c
···
1411
1411
CONFIG_ETRAX_RS485_LTC1387_RXEN_PORT_G_BIT, 1);
1412
1412
#endif
1413
1413
1414
-
info->rs485.flags = r->flags;
1415
-
if (r->delay_rts_before_send >= 1000)
1414
+
info->rs485 = *r;
1415
+
1416
+
/* Maximum delay before RTS equal to 1000 */
1417
+
if (info->rs485.delay_rts_before_send >= 1000)
1416
1418
info->rs485.delay_rts_before_send = 1000;
1417
-
else
1418
-
info->rs485.delay_rts_before_send = r->delay_rts_before_send;
1419
+
1419
1420
/* printk("rts: on send = %i, after = %i, enabled = %i",
1420
1421
info->rs485.rts_on_send,
1421
1422
info->rs485.rts_after_sent,
···
3235
3234
e100_disable_rx(info);
3236
3235
e100_enable_rx_irq(info);
3237
3236
#endif
3238
-
3239
-
if (info->rs485.delay_rts_before_send > 0)
3240
-
msleep(info->rs485.delay_rts_before_send);
3237
+
if ((info->rs485.flags & SER_RS485_RTS_BEFORE_SEND) &&
3238
+
(info->rs485.delay_rts_before_send > 0))
3239
+
msleep(info->rs485.delay_rts_before_send);
3241
3240
}
3242
3241
#endif /* CONFIG_ETRAX_RS485 */
3243
3242
···
3695
3694
3696
3695
rs485data.delay_rts_before_send = rs485ctrl.delay_rts_before_send;
3697
3696
rs485data.flags = 0;
3697
+
if (rs485data.delay_rts_before_send != 0)
3698
+
rs485data.flags |= SER_RS485_RTS_BEFORE_SEND;
3699
+
else
3700
+
rs485data.flags &= ~(SER_RS485_RTS_BEFORE_SEND);
3701
+
3698
3702
if (rs485ctrl.enabled)
3699
3703
rs485data.flags |= SER_RS485_ENABLED;
3700
3704
else
···
3737
3731
/* This is the ioctl to get RS485 data from user-space */
3738
3732
if (copy_to_user((struct serial_rs485 *) arg,
3739
3733
rs485data,
3740
-
sizeof(serial_rs485)))
3734
+
sizeof(struct serial_rs485)))
3741
3735
return -EFAULT;
3742
3736
break;
3743
3737
}
···
4533
4527
/* Set sane defaults */
4534
4528
info->rs485.flags &= ~(SER_RS485_RTS_ON_SEND);
4535
4529
info->rs485.flags |= SER_RS485_RTS_AFTER_SEND;
4530
+
info->rs485.flags &= ~(SER_RS485_RTS_BEFORE_SEND);
4536
4531
info->rs485.delay_rts_before_send = 0;
4537
4532
info->rs485.flags &= ~(SER_RS485_ENABLED);
4538
4533
#endif