| From 683a0e4d7971c3186dc4d429027debfe309129aa Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <jhovold@gmail.com> |
| Date: Sat, 27 Jul 2013 13:34:42 +0200 |
| Subject: USB: mos7840: fix pointer casts |
| |
| From: Johan Hovold <jhovold@gmail.com> |
| |
| commit 683a0e4d7971c3186dc4d429027debfe309129aa upstream. |
| |
| 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] |
| |
| Signed-off-by: Johan Hovold <jhovold@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/serial/mos7840.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/usb/serial/mos7840.c |
| +++ b/drivers/usb/serial/mos7840.c |
| @@ -2236,14 +2236,14 @@ static int mos7840_probe(struct usb_seri |
| |
| 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; |
| @@ -2254,7 +2254,7 @@ static int mos7840_calc_num_ports(struct |
| 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; |
