From 9e0265abb14d66c8c9fc548845c98a01dd9053af Mon Sep 17 00:00:00 2001 From: Simon Arlott Date: Sat, 21 Nov 2009 15:03:23 +0000 Subject: [PATCH] --- yaml --- r: 185214 b: refs/heads/master c: 1bfbd283cd3082b6cadfbf340faf7d35b8a36b83 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/networking/cxacru.txt | 1 + trunk/drivers/usb/atm/cxacru.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 10fcab1330df..92ff03cbe938 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e0fa90d1de10d68429afa9353e10bb9436455db +refs/heads/master: 1bfbd283cd3082b6cadfbf340faf7d35b8a36b83 diff --git a/trunk/Documentation/networking/cxacru.txt b/trunk/Documentation/networking/cxacru.txt index b074681a963e..3532ceecd2c3 100644 --- a/trunk/Documentation/networking/cxacru.txt +++ b/trunk/Documentation/networking/cxacru.txt @@ -61,6 +61,7 @@ several sysfs attribute files for retrieving device statistics: * mac_address * modulation + "" (when not connected) "ANSI T1.413" "ITU-T G.992.1 (G.DMT)" "ITU-T G.992.2 (G.LITE)" diff --git a/trunk/drivers/usb/atm/cxacru.c b/trunk/drivers/usb/atm/cxacru.c index 56802d2e994b..4a26a6c93bec 100644 --- a/trunk/drivers/usb/atm/cxacru.c +++ b/trunk/drivers/usb/atm/cxacru.c @@ -267,12 +267,12 @@ static ssize_t cxacru_sysfs_showattr_LINE(u32 value, char *buf) static ssize_t cxacru_sysfs_showattr_MODU(u32 value, char *buf) { static char *str[] = { - NULL, + "", "ANSI T1.413", "ITU-T G.992.1 (G.DMT)", "ITU-T G.992.2 (G.LITE)" }; - if (unlikely(value >= ARRAY_SIZE(str) || str[value] == NULL)) + if (unlikely(value >= ARRAY_SIZE(str))) return snprintf(buf, PAGE_SIZE, "%u\n", value); return snprintf(buf, PAGE_SIZE, "%s\n", str[value]); }