Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 298036
b: refs/heads/master
c: 886ee54
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and Len Brown committed Mar 22, 2012
1 parent b14ff4d commit 5250f0b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b11de07ce561574b6e03c8192b28bad540da8f79
refs/heads/master: 886ee5463530036f6171e1376118e7014cf33f7f
11 changes: 5 additions & 6 deletions trunk/drivers/thermal/thermal_sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,7 @@ passive_show(struct device *dev, struct device_attribute *attr,
static DEVICE_ATTR(type, 0444, type_show, NULL);
static DEVICE_ATTR(temp, 0444, temp_show, NULL);
static DEVICE_ATTR(mode, 0644, mode_show, mode_store);
static DEVICE_ATTR(passive, S_IRUGO | S_IWUSR, passive_show, \
passive_store);
static DEVICE_ATTR(passive, S_IRUGO | S_IWUSR, passive_show, passive_store);

static struct device_attribute trip_point_attrs[] = {
__ATTR(trip_point_0_type, 0444, trip_point_type_show, NULL),
Expand Down Expand Up @@ -1313,8 +1312,8 @@ int thermal_generate_netlink_event(u32 orig, enum events event)
static unsigned int thermal_event_seqnum;

/* allocate memory */
size = nla_total_size(sizeof(struct thermal_genl_event)) + \
nla_total_size(0);
size = nla_total_size(sizeof(struct thermal_genl_event)) +
nla_total_size(0);

skb = genlmsg_new(size, GFP_ATOMIC);
if (!skb)
Expand All @@ -1330,8 +1329,8 @@ int thermal_generate_netlink_event(u32 orig, enum events event)
}

/* fill the data */
attr = nla_reserve(skb, THERMAL_GENL_ATTR_EVENT, \
sizeof(struct thermal_genl_event));
attr = nla_reserve(skb, THERMAL_GENL_ATTR_EVENT,
sizeof(struct thermal_genl_event));

if (!attr) {
nlmsg_free(skb);
Expand Down

0 comments on commit 5250f0b

Please sign in to comment.