]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
USB: mos7840: fix pointer casts
authorJohan Hovold <jhovold@gmail.com>
Sat, 27 Jul 2013 11:34:42 +0000 (13:34 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 28 Jul 2013 18:32:18 +0000 (11:32 -0700)
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: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/serial/mos7840.c

index c10fc15bf8510023e41c35ba32175540f5dbd1a8..d953d674f22295a0aac144a7f9958c8dbb4df6a6 100644 (file)
@@ -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;
@@ -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;