Commit 683a0e4d authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: mos7840: fix pointer casts

Silence compiler warnings on 64-bit systems introduced by commit
05cf0dec ("USB: mos7840: fix race in led handling") which uses the
usb-serial data pointer to temporarily store the device type during
probe but failed to add the required casts.

[gregkh - change uintptr_t to unsigned long]

Cc: stable@vger.kernel.org
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 05cf0dec
...@@ -2221,14 +2221,14 @@ static int mos7840_probe(struct usb_serial *serial, ...@@ -2221,14 +2221,14 @@ static int mos7840_probe(struct usb_serial *serial,
kfree(buf); kfree(buf);
out: out:
usb_set_serial_data(serial, (void *)device_type); usb_set_serial_data(serial, (void *)(unsigned long)device_type);
return 0; return 0;
} }
static int mos7840_calc_num_ports(struct usb_serial *serial) static int mos7840_calc_num_ports(struct usb_serial *serial)
{ {
int device_type = (int)usb_get_serial_data(serial); int device_type = (unsigned long)usb_get_serial_data(serial);
int mos7840_num_ports; int mos7840_num_ports;
mos7840_num_ports = (device_type >> 4) & 0x000F; mos7840_num_ports = (device_type >> 4) & 0x000F;
...@@ -2239,7 +2239,7 @@ static int mos7840_calc_num_ports(struct usb_serial *serial) ...@@ -2239,7 +2239,7 @@ static int mos7840_calc_num_ports(struct usb_serial *serial)
static int mos7840_port_probe(struct usb_serial_port *port) static int mos7840_port_probe(struct usb_serial_port *port)
{ {
struct usb_serial *serial = port->serial; struct usb_serial *serial = port->serial;
int device_type = (int)usb_get_serial_data(serial); int device_type = (unsigned long)usb_get_serial_data(serial);
struct moschip_port *mos7840_port; struct moschip_port *mos7840_port;
int status; int status;
int pnum; int pnum;
......
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