Skip to content

Commit

Permalink
ALSA: line6: Use explicit type for serial number
Browse files Browse the repository at this point in the history
The serial number (aka ESN) is a 32-bit value.

Signed-off-by: Chris Rorvick <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
crorvick authored and tiwai committed Feb 11, 2015
1 parent e474e7f commit 12b0015
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion sound/usb/line6/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ EXPORT_SYMBOL_GPL(line6_write_data);
Read Line 6 device serial number.
(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,
sizeof(*serial_number));
Expand Down
2 changes: 1 addition & 1 deletion sound/usb/line6/driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
size_t datalen);
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,
const char *buffer, int size);
extern int line6_send_sysex_message(struct usb_line6 *line6,
Expand Down
4 changes: 2 additions & 2 deletions sound/usb/line6/pod.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ struct usb_line6_pod {
int startup_progress;

/* Serial number of device */
int serial_number;
u32 serial_number;

/* Firmware version (x 100) */
int firmware_version;
Expand Down Expand Up @@ -247,7 +247,7 @@ static ssize_t serial_number_show(struct device *dev,
struct usb_interface *interface = to_usb_interface(dev);
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);
}

/*
Expand Down
2 changes: 1 addition & 1 deletion sound/usb/line6/toneport.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ struct usb_line6_toneport {
int source;

/* Serial number of device */
int serial_number;
u32 serial_number;

/* Firmware version (x 100) */
int firmware_version;
Expand Down

0 comments on commit 12b0015

Please sign in to comment.