diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-12 14:48:04 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-12 14:48:04 +1000 |
| commit | 22fa2554e4607df087d913c5b7e16fae60c790e1 (patch) | |
| tree | 04fef4b446dc6dede305ae93c792addb2ac0cda4 | |
| parent | 436a3646e8f6038f4b839f1300a59f64f5391471 (diff) | |
| parent | 4768dceb84d550cb846852331203a6384aa883dd (diff) | |
Merge branch 'akpm/master'
| -rw-r--r-- | drivers/net/ieee802154/at86rf230.c | 35 | ||||
| -rw-r--r-- | drivers/w1/w1_int.c | 3 |
2 files changed, 11 insertions, 27 deletions
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c index b8b0628dc2f3..9756e6451038 100644 --- a/drivers/net/ieee802154/at86rf230.c +++ b/drivers/net/ieee802154/at86rf230.c @@ -1645,32 +1645,17 @@ static struct dentry *at86rf230_debugfs_root; 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", - lp->trac.success_data_pending); - if (ret < 0) - return ret; - - ret = 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", - 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, "SUCCESS:\t\t%8llu\n", lp->trac.success); + seq_printf(file, "SUCCESS_DATA_PENDING:\t%8llu\n", + lp->trac.success_data_pending); + seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n", + lp->trac.success_wait_for_ack); + seq_printf(file, "CHANNEL_ACCESS_FAILURE:\t%8llu\n", + lp->trac.channel_access_failure); + 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; } |