From f2b0aef2bb2d48c70a534aa4bf85e0a06e89bfc0 Mon Sep 17 00:00:00 2001 From: Henk Date: Wed, 12 Oct 2005 15:02:56 +0200 Subject: [PATCH] --- yaml --- r: 10795 b: refs/heads/master c: af64a5ebb817532965d18b792d6d74afecfb0bcf h: refs/heads/master i: 10793: cf825327d1ca08f850be9092bb011a6f529b8dc4 10791: 93843de2b25b4afe9388e390d2780ab65fc9a95d v: v3 --- [refs] | 2 +- trunk/Documentation/input/yealink.txt | 19 ++++++++++++++++--- trunk/MAINTAINERS | 12 ++++++------ trunk/drivers/usb/input/map_to_7segment.h | 2 +- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 3c995f69490f..86028ac7817d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b81d34363c0b17c47f4ef63d5888c4f47f315d29 +refs/heads/master: af64a5ebb817532965d18b792d6d74afecfb0bcf diff --git a/trunk/Documentation/input/yealink.txt b/trunk/Documentation/input/yealink.txt index 85f095a7ad04..0962c5c948be 100644 --- a/trunk/Documentation/input/yealink.txt +++ b/trunk/Documentation/input/yealink.txt @@ -2,7 +2,6 @@ Driver documentation for yealink usb-p1k phones 0. Status ~~~~~~~~~ - The p1k is a relatively cheap usb 1.1 phone with: - keyboard full support, yealink.ko / input event API - LCD full support, yealink.ko / sysfs API @@ -17,9 +16,8 @@ For vendor documentation see http://www.yealink.com 1. Compilation (stand alone version) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Currently only kernel 2.6.x.y versions are supported. -In order to build the yealink.ko module do: +In order to build the yealink.ko module do make @@ -28,6 +26,21 @@ the Makefile is pointing to the location where your kernel sources are located, default /usr/src/linux. +1.1 Troubleshooting +~~~~~~~~~~~~~~~~~~~ +Q: Module yealink compiled and installed without any problem but phone + is not initialized and does not react to any actions. +A: If you see something like: + hiddev0: USB HID v1.00 Device [Yealink Network Technology Ltd. VOIP USB Phone + in dmesg, it means that the hid driver has grabbed the device first. Try to + load module yealink before any other usb hid driver. Please see the + instructions provided by your distribution on module configuration. + +Q: Phone is working now (displays version and accepts keypad input) but I can't + find the sysfs files. +A: The sysfs files are located on the particular usb endpoint. On most + distributions you can do: "find /sys/ -name get_icons" for a hint. + 2. keyboard features ~~~~~~~~~~~~~~~~~~~~ diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 3928dc7d6ea9..2868b2879755 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -116,12 +116,6 @@ M: ajk@iehk.rwth-aachen.de L: linux-hams@vger.kernel.org S: Maintained -YEALINK PHONE DRIVER -P: Henk Vergonet -M: Henk.Vergonet@gmail.com -L: usbb2k-api-dev@nongnu.org -S: Maintained - 8139CP 10/100 FAST ETHERNET DRIVER P: Jeff Garzik M: jgarzik@pobox.com @@ -2863,6 +2857,12 @@ M: jpr@f6fbb.org L: linux-hams@vger.kernel.org S: Maintained +YEALINK PHONE DRIVER +P: Henk Vergonet +M: Henk.Vergonet@gmail.com +L: usbb2k-api-dev@nongnu.org +S: Maintained + YMFPCI YAMAHA PCI SOUND (Use ALSA instead) P: Pete Zaitcev M: zaitcev@yahoo.com diff --git a/trunk/drivers/usb/input/map_to_7segment.h b/trunk/drivers/usb/input/map_to_7segment.h index 52ff27f15127..a424094d9fe2 100644 --- a/trunk/drivers/usb/input/map_to_7segment.h +++ b/trunk/drivers/usb/input/map_to_7segment.h @@ -79,7 +79,7 @@ struct seg7_conversion_map { static inline int map_to_seg7(struct seg7_conversion_map *map, int c) { - return c & 0x7f ? map->table[c] : -EINVAL; + return c >= 0 && c < sizeof(map->table) ? map->table[c] : -EINVAL; } #define SEG7_CONVERSION_MAP(_name, _map) \