Skip to content

Commit

Permalink
USB: mos7840: fix pointer casts
Browse files Browse the repository at this point in the history
Silence compiler warnings on 64-bit systems introduced by commit
05cf0de ("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: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed Jul 28, 2013
1 parent 05cf0de commit 683a0e4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/usb/serial/mos7840.c
Original file line number Diff line number Diff line change
Expand Up @@ -2221,14 +2221,14 @@ static int mos7840_probe(struct usb_serial *serial,

kfree(buf);
out:
usb_set_serial_data(serial, (void *)device_type);
usb_set_serial_data(serial, (void *)(unsigned long)device_type);

return 0;
}

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;

mos7840_num_ports = (device_type >> 4) & 0x000F;
Expand All @@ -2239,7 +2239,7 @@ static int mos7840_calc_num_ports(struct usb_serial *serial)
static int mos7840_port_probe(struct usb_serial_port *port)
{
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;
int status;
int pnum;
Expand Down

0 comments on commit 683a0e4

Please sign in to comment.