summaryrefslogtreecommitdiff
path: root/sound/usb/line6
diff options
context:
space:
mode:
authorChris Rorvick <chris@rorvick.com>2015-02-10 23:03:16 -0600
committerTakashi Iwai <tiwai@suse.de>2015-02-11 10:39:05 +0100
commit12b00157fd8572ee1f54b70bbf496641a1608924 (patch)
tree30769a89573e5bf1b37c5e94f78ca48077e04407 /sound/usb/line6
parente474e7fd404b9e516f1c90a1c3f485e21be34c15 (diff)
ALSA: line6: Use explicit type for serial number
The serial number (aka ESN) is a 32-bit value. Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/line6')
-rw-r--r--sound/usb/line6/driver.c2
-rw-r--r--sound/usb/line6/driver.h2
-rw-r--r--sound/usb/line6/pod.c4
-rw-r--r--sound/usb/line6/toneport.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index 6c2d418b53f1..99b63a7902f3 100644
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -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));
diff --git a/sound/usb/line6/driver.h b/sound/usb/line6/driver.h
index 92a662a0469e..5d20294d64f4 100644
--- a/sound/usb/line6/driver.h
+++ b/sound/usb/line6/driver.h
@@ -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,
diff --git a/sound/usb/line6/pod.c b/sound/usb/line6/pod.c
index 09017bc9615b..daf81d169a42 100644
--- a/sound/usb/line6/pod.c
+++ b/sound/usb/line6/pod.c
@@ -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;
@@ -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);
}
/*
diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c
index 1a0a485b6654..ddf7368c2001 100644
--- a/sound/usb/line6/toneport.c
+++ b/sound/usb/line6/toneport.c
@@ -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;