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

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

drivers/usb/serial/ch341.c

+1 −0
Original line number Diff line number Diff line
@@ -863,4 +863,5 @@ static struct usb_serial_driver * const serial_drivers[] = { 


module_usb_serial_driver(serial_drivers, id_table);



MODULE_DESCRIPTION("Winchiphead CH341 USB Serial driver");

MODULE_LICENSE("GPL v2");

drivers/usb/serial/garmin_gps.c

+2 −3
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ struct garmin_packet { 
	int               seq;

	/* the real size of the data array, always > 0 */

	int               size;

	__u8              data[];

	__u8              data[] __counted_by(size);

};



/* structure used to keep the current state of the driver */
@@ -267,8 +267,7 @@ static int pkt_add(struct garmin_data *garmin_data_p, 


	/* process only packets containing data ... */

	if (data_length) {

		pkt = kmalloc(sizeof(struct garmin_packet)+data_length,

								GFP_ATOMIC);

		pkt = kmalloc(struct_size(pkt, data, data_length), GFP_ATOMIC);

		if (!pkt)

			return 0;

drivers/usb/serial/mxuport.c

+1 −0
Original line number Diff line number Diff line
@@ -1315,4 +1315,5 @@ module_usb_serial_driver(serial_drivers, mxuport_idtable); 


MODULE_AUTHOR("Andrew Lunn <andrew@lunn.ch>");

MODULE_AUTHOR("<support@moxa.com>");

MODULE_DESCRIPTION("Moxa UPORT USB Serial driver");

MODULE_LICENSE("GPL");

drivers/usb/serial/navman.c

+1 −0
Original line number Diff line number Diff line
@@ -112,4 +112,5 @@ static struct usb_serial_driver * const serial_drivers[] = { 


module_usb_serial_driver(serial_drivers, id_table);



MODULE_DESCRIPTION("Navman USB Serial driver");

MODULE_LICENSE("GPL v2");

drivers/usb/serial/qcaux.c

+1 −0
Original line number Diff line number Diff line
@@ -84,4 +84,5 @@ static struct usb_serial_driver * const serial_drivers[] = { 
};



module_usb_serial_driver(serial_drivers, id_table);

MODULE_DESCRIPTION("Qualcomm USB Auxiliary Serial Port driver");

MODULE_LICENSE("GPL v2");