Commit 3ca06e90 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'usb-serial-6.11-rc1' of...

Merge tag 'usb-serial-6.11-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus

Johan writes:

USB-serial updates for 6.11-rc1

Here are the USB-serial updates for 6.11-rc1, including:

 - add missing module descriptions
 - add flexible array annotation in garmin_gps

Included are also various clean ups.

All have been in linux-next with no reported issues.

* tag 'usb-serial-6.11-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: garmin_gps: use struct_size() to allocate pkt
  USB: serial: garmin_gps: annotate struct garmin_packet with __counted_by
  USB: serial: add missing MODULE_DESCRIPTION() macros
  USB: serial: spcp8x5: remove unused struct 'spcp8x5_usb_ctrl_arg'
parents 8400291e df8c0b8a
...@@ -863,4 +863,5 @@ static struct usb_serial_driver * const serial_drivers[] = { ...@@ -863,4 +863,5 @@ static struct usb_serial_driver * const serial_drivers[] = {
module_usb_serial_driver(serial_drivers, id_table); module_usb_serial_driver(serial_drivers, id_table);
MODULE_DESCRIPTION("Winchiphead CH341 USB Serial driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
...@@ -104,7 +104,7 @@ struct garmin_packet { ...@@ -104,7 +104,7 @@ struct garmin_packet {
int seq; int seq;
/* the real size of the data array, always > 0 */ /* the real size of the data array, always > 0 */
int size; int size;
__u8 data[]; __u8 data[] __counted_by(size);
}; };
/* structure used to keep the current state of the driver */ /* structure used to keep the current state of the driver */
...@@ -267,8 +267,7 @@ static int pkt_add(struct garmin_data *garmin_data_p, ...@@ -267,8 +267,7 @@ static int pkt_add(struct garmin_data *garmin_data_p,
/* process only packets containing data ... */ /* process only packets containing data ... */
if (data_length) { if (data_length) {
pkt = kmalloc(sizeof(struct garmin_packet)+data_length, pkt = kmalloc(struct_size(pkt, data, data_length), GFP_ATOMIC);
GFP_ATOMIC);
if (!pkt) if (!pkt)
return 0; return 0;
......
...@@ -1315,4 +1315,5 @@ module_usb_serial_driver(serial_drivers, mxuport_idtable); ...@@ -1315,4 +1315,5 @@ module_usb_serial_driver(serial_drivers, mxuport_idtable);
MODULE_AUTHOR("Andrew Lunn <andrew@lunn.ch>"); MODULE_AUTHOR("Andrew Lunn <andrew@lunn.ch>");
MODULE_AUTHOR("<support@moxa.com>"); MODULE_AUTHOR("<support@moxa.com>");
MODULE_DESCRIPTION("Moxa UPORT USB Serial driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -112,4 +112,5 @@ static struct usb_serial_driver * const serial_drivers[] = { ...@@ -112,4 +112,5 @@ static struct usb_serial_driver * const serial_drivers[] = {
module_usb_serial_driver(serial_drivers, id_table); module_usb_serial_driver(serial_drivers, id_table);
MODULE_DESCRIPTION("Navman USB Serial driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
...@@ -84,4 +84,5 @@ static struct usb_serial_driver * const serial_drivers[] = { ...@@ -84,4 +84,5 @@ static struct usb_serial_driver * const serial_drivers[] = {
}; };
module_usb_serial_driver(serial_drivers, id_table); module_usb_serial_driver(serial_drivers, id_table);
MODULE_DESCRIPTION("Qualcomm USB Auxiliary Serial Port driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
...@@ -49,16 +49,6 @@ static const struct usb_device_id id_table[] = { ...@@ -49,16 +49,6 @@ static const struct usb_device_id id_table[] = {
}; };
MODULE_DEVICE_TABLE(usb, id_table); MODULE_DEVICE_TABLE(usb, id_table);
struct spcp8x5_usb_ctrl_arg {
u8 type;
u8 cmd;
u8 cmd_type;
u16 value;
u16 index;
u16 length;
};
/* spcp8x5 spec register define */ /* spcp8x5 spec register define */
#define MCR_CONTROL_LINE_RTS 0x02 #define MCR_CONTROL_LINE_RTS 0x02
#define MCR_CONTROL_LINE_DTR 0x01 #define MCR_CONTROL_LINE_DTR 0x01
......
...@@ -190,4 +190,5 @@ static struct usb_serial_driver * const serial_drivers[] = { ...@@ -190,4 +190,5 @@ static struct usb_serial_driver * const serial_drivers[] = {
module_usb_serial_driver(serial_drivers, id_table); module_usb_serial_driver(serial_drivers, id_table);
MODULE_DESCRIPTION("Symbol USB barcode to serial driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
...@@ -163,4 +163,5 @@ static const struct usb_device_id id_table[] = { ...@@ -163,4 +163,5 @@ static const struct usb_device_id id_table[] = {
MODULE_DEVICE_TABLE(usb, id_table); MODULE_DEVICE_TABLE(usb, id_table);
module_usb_serial_driver(serial_drivers, id_table); module_usb_serial_driver(serial_drivers, id_table);
MODULE_DESCRIPTION("USB Serial 'Simple' driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
...@@ -104,4 +104,5 @@ static struct usb_serial_driver * const serial_drivers[] = { ...@@ -104,4 +104,5 @@ static struct usb_serial_driver * const serial_drivers[] = {
}; };
module_usb_serial_driver(serial_drivers, id_table_combined); module_usb_serial_driver(serial_drivers, id_table_combined);
MODULE_DESCRIPTION("USB Debug cable driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment