From e3e1b3ac5cf41d78e5ad5653bcdf8df33ca97fa6 Mon Sep 17 00:00:00 2001 From: Arthur Jones Date: Fri, 25 Jul 2008 01:49:12 -0700 Subject: [PATCH] --- yaml --- r: 106051 b: refs/heads/master c: 124682c78563e10ba8b2ecd21b0f1098903b7808 h: refs/heads/master i: 106049: 724470d879c133a3c86b531ce4a1c97206f7d9f5 106047: 5d4f6e98715730801930b4da3fda7a8ca19579e2 v: v3 --- [refs] | 2 +- trunk/drivers/edac/edac_mc_sysfs.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fc745c02c22e..476b50093960 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9fc82adca43d38a1b79128d80750bd361e15abe +refs/heads/master: 124682c78563e10ba8b2ecd21b0f1098903b7808 diff --git a/trunk/drivers/edac/edac_mc_sysfs.c b/trunk/drivers/edac/edac_mc_sysfs.c index 479492819dba..ad218fe4942d 100644 --- a/trunk/drivers/edac/edac_mc_sysfs.c +++ b/trunk/drivers/edac/edac_mc_sysfs.c @@ -178,7 +178,11 @@ static ssize_t csrow_edac_mode_show(struct csrow_info *csrow, char *data, static ssize_t channel_dimm_label_show(struct csrow_info *csrow, char *data, int channel) { - return snprintf(data, EDAC_MC_LABEL_LEN, "%s", + /* if field has not been initialized, there is nothing to send */ + if (!csrow->channels[channel].label[0]) + return 0; + + return snprintf(data, EDAC_MC_LABEL_LEN, "%s\n", csrow->channels[channel].label); }