diff --git a/[refs] b/[refs] index 1862dca57a6d..b081edd14396 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ae68e7345b0d5d49e1c2c7583d15a3c177f8a2f +refs/heads/master: 94758185689ee96694558d720d44e81b4e0abc3d diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h index 5ad17cccdd71..3ab4d63609b6 100644 --- a/trunk/include/linux/device.h +++ b/trunk/include/linux/device.h @@ -502,7 +502,7 @@ ssize_t device_store_int(struct device *dev, struct device_attribute *attr, { __ATTR(_name, _mode, device_show_ulong, device_store_ulong), &(_var) } #define DEVICE_INT_ATTR(_name, _mode, _var) \ struct dev_ext_attribute dev_attr_##_name = \ - { __ATTR(_name, _mode, device_show_ulong, device_store_ulong), &(_var) } + { __ATTR(_name, _mode, device_show_int, device_store_int), &(_var) } extern int device_create_file(struct device *device, const struct device_attribute *entry);