diff options
| author | Simon Arlott <simon@fire.lp0.eu> | 2009-11-21 16:03:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 23:52:57 +0100 |
| commit | 1bfbd283cd3082b6cadfbf340faf7d35b8a36b83 (patch) | |
| tree | f01f9d74dcd3e829449953b5d84a26013a5c2f42 | |
| parent | USB: MXC: add platform resources for i.MX21 USB host controller. (diff) | |
| download | linux-1bfbd283cd3082b6cadfbf340faf7d35b8a36b83.tar.xz linux-1bfbd283cd3082b6cadfbf340faf7d35b8a36b83.zip | |
USB: cxacru: return an empty value for modulation if there is no connection
When there is no connection, return an empty string
instead of "0" for the connection modulation.
Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | Documentation/networking/cxacru.txt | 1 | ||||
| -rw-r--r-- | drivers/usb/atm/cxacru.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/networking/cxacru.txt b/Documentation/networking/cxacru.txt index b074681a963e..3532ceecd2c3 100644 --- a/Documentation/networking/cxacru.txt +++ b/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/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c index 56802d2e994b..4a26a6c93bec 100644 --- a/drivers/usb/atm/cxacru.c +++ b/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]); } |