diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-11 14:01:46 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-11 14:01:46 +1000 |
| commit | adb3c0714d8dc1fa06a3bbed403bfe0aef5174e5 (patch) | |
| tree | 9a86a16bebce92e606a14e1f59b4d7af520dc998 | |
| parent | ce6cd5fd7ed87d6740a9af5fa62e7f0b758f6fb4 (diff) | |
| parent | f90c288de05dbe35101435790c95e0ac60553e2a (diff) | |
Merge branch 'akpm/master'
| -rw-r--r-- | drivers/net/ieee802154/at86rf230.c | 28 | ||||
| -rw-r--r-- | drivers/w1/w1_int.c | 3 |
2 files changed, 8 insertions, 23 deletions
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c index b8b0628dc2f3..a9f3af63e590 100644 --- a/drivers/net/ieee802154/at86rf230.c +++ b/drivers/net/ieee802154/at86rf230.c @@ -1647,30 +1647,16 @@ static int at86rf230_stats_show(struct seq_file *file, void *offset) struct at86rf230_local *lp = file->private; int ret; - ret = seq_printf(file, "SUCCESS:\t\t%8llu\n", lp->trac.success); - if (ret < 0) - return ret; - - ret = seq_printf(file, "SUCCESS_DATA_PENDING:\t%8llu\n", + seq_printf(file, "SUCCESS:\t\t%8llu\n", lp->trac.success); + seq_printf(file, "SUCCESS_DATA_PENDING:\t%8llu\n", lp->trac.success_data_pending); - if (ret < 0) - return ret; - - ret = seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n", + seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n", lp->trac.success_wait_for_ack); - if (ret < 0) - return ret; - - ret = seq_printf(file, "CHANNEL_ACCESS_FAILURE:\t%8llu\n", + seq_printf(file, "CHANNEL_ACCESS_FAILURE:\t%8llu\n", lp->trac.channel_access_failure); - if (ret < 0) - return ret; - - ret = seq_printf(file, "NO_ACK:\t\t\t%8llu\n", lp->trac.no_ack); - if (ret < 0) - return ret; - - return seq_printf(file, "INVALID:\t\t%8llu\n", lp->trac.invalid); + seq_printf(file, "NO_ACK:\t\t\t%8llu\n", lp->trac.no_ack); + seq_printf(file, "INVALID:\t\t%8llu\n", lp->trac.invalid); + return 0; } static int at86rf230_stats_open(struct inode *inode, struct file *file) diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 47249a30eae3..20f766afa4c7 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c @@ -91,8 +91,7 @@ static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl, err = device_register(&dev->dev); if (err) { pr_err("Failed to register master device. err=%d\n", err); - memset(dev, 0, sizeof(struct w1_master)); - kfree(dev); + put_device(&dev->dev); dev = NULL; } |