Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12b00157 authored by Chris Rorvick's avatar Chris Rorvick Committed by Takashi Iwai
Browse files

ALSA: line6: Use explicit type for serial number 



The serial number (aka ESN) is a 32-bit value.

Signed-off-by: default avatarChris Rorvick <chris@rorvick.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e474e7fd

sound/usb/line6/driver.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -426,7 +426,7 @@ EXPORT_SYMBOL_GPL(line6_write_data); 
	Read Line 6 device serial number.

	Read Line 6 device serial number.

	(POD, TonePort, GuitarPort)

	(POD, TonePort, GuitarPort)

*/

*/

int line6_read_serial_number(struct usb_line6 *line6, int *serial_number)

int line6_read_serial_number(struct usb_line6 *line6, u32 *serial_number)

{

{

	return line6_read_data(line6, 0x80d0, serial_number,

	return line6_read_data(line6, 0x80d0, serial_number,

			       sizeof(*serial_number));

			       sizeof(*serial_number));

sound/usb/line6/driver.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -150,7 +150,7 @@ extern char *line6_alloc_sysex_buffer(struct usb_line6 *line6, int code1, 
extern int line6_read_data(struct usb_line6 *line6, int address, void *data,

extern int line6_read_data(struct usb_line6 *line6, int address, void *data,

			   size_t datalen);

			   size_t datalen);

extern int line6_read_serial_number(struct usb_line6 *line6,

extern int line6_read_serial_number(struct usb_line6 *line6,

				    int *serial_number);

				    u32 *serial_number);

extern int line6_send_raw_message_async(struct usb_line6 *line6,

extern int line6_send_raw_message_async(struct usb_line6 *line6,

					const char *buffer, int size);

					const char *buffer, int size);

extern int line6_send_sysex_message(struct usb_line6 *line6,

extern int line6_send_sysex_message(struct usb_line6 *line6,

sound/usb/line6/pod.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ struct usb_line6_pod { 
	int startup_progress;

	int startup_progress;





	/* Serial number of device */

	/* Serial number of device */

	int serial_number;

	u32 serial_number;





	/* Firmware version (x 100) */

	/* Firmware version (x 100) */

	int firmware_version;

	int firmware_version;
@@ -247,7 +247,7 @@ static ssize_t serial_number_show(struct device *dev, 
	struct usb_interface *interface = to_usb_interface(dev);

	struct usb_interface *interface = to_usb_interface(dev);

	struct usb_line6_pod *pod = usb_get_intfdata(interface);

	struct usb_line6_pod *pod = usb_get_intfdata(interface);





	return sprintf(buf, "%d\n", pod->serial_number);

	return sprintf(buf, "%u\n", pod->serial_number);

}

}





/*

/*

sound/usb/line6/toneport.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ struct usb_line6_toneport { 
	int source;

	int source;





	/* Serial number of device */

	/* Serial number of device */

	int serial_number;

	u32 serial_number;





	/* Firmware version (x 100) */

	/* Firmware version (x 100) */

	int firmware_version;

	int firmware_version;