Merge commit 'v3.2-rc3' into next

[linux-2.6-block.git] / drivers / input / misc / ati_remote2.c

diff --git a/drivers/input/misc/ati_remote2.c b/drivers/input/misc/ati_remote2.c
index 1de58e8a1b71216180808f7bd2c2e7d233f1cce7..a34896ed7ed3a53ac31a7b05d420285d9503ac28 100644 (file)
--- a/drivers/input/misc/ati_remote2.c
+++ b/drivers/input/misc/ati_remote2.c
@@ -11,6 +11,7 @@
 
 #include <linux/usb/input.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 
 #define DRIVER_DESC    "ATI/Philips USB RF remote driver"
 #define DRIVER_VERSION "0.3"
@@ -41,13 +42,13 @@ static int ati_remote2_set_mask(const char *val,
                                const struct kernel_param *kp,
                                unsigned int max)
 {
-       unsigned long mask;
+       unsigned int mask;
        int ret;
 
        if (!val)
                return -EINVAL;
 
-       ret = strict_strtoul(val, 0, &mask);
+       ret = kstrtouint(val, 0, &mask);
        if (ret)
                return ret;
 
@@ -719,11 +720,12 @@ static ssize_t ati_remote2_store_channel_mask(struct device *dev,
        struct usb_device *udev = to_usb_device(dev);
        struct usb_interface *intf = usb_ifnum_to_if(udev, 0);
        struct ati_remote2 *ar2 = usb_get_intfdata(intf);
-       unsigned long mask;
+       unsigned int mask;
        int r;
 
-       if (strict_strtoul(buf, 0, &mask))
-               return -EINVAL;
+       r = kstrtouint(buf, 0, &mask);
+       if (r)
+               return r;
 
        if (mask & ~ATI_REMOTE2_MAX_CHANNEL_MASK)
                return -EINVAL;
@@ -768,10 +770,12 @@ static ssize_t ati_remote2_store_mode_mask(struct device *dev,
        struct usb_device *udev = to_usb_device(dev);
        struct usb_interface *intf = usb_ifnum_to_if(udev, 0);
        struct ati_remote2 *ar2 = usb_get_intfdata(intf);
-       unsigned long mask;
+       unsigned int mask;
+       int err;
 
-       if (strict_strtoul(buf, 0, &mask))
-               return -EINVAL;
+       err = kstrtouint(buf, 0, &mask);
+       if (err)
+               return err;
 
        if (mask & ~ATI_REMOTE2_MAX_MODE_MASK)
                return -EINVAL;