mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
V4L/DVB: sms: properly initialize IR phys and IR name
sms were using a non-compliant nomenclature for the USB devices. Fix it. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
4eebfb0a5f
commit
1722f3b376
3 changed files with 15 additions and 10 deletions
|
@ -22,6 +22,7 @@
|
|||
|
||||
#include <linux/types.h>
|
||||
#include <linux/input.h>
|
||||
#include <media/ir-core.h>
|
||||
|
||||
#include "smscoreapi.h"
|
||||
#include "smsir.h"
|
||||
|
@ -247,6 +248,7 @@ void sms_ir_event(struct smscore_device_t *coredev, const char *buf, int len)
|
|||
int sms_ir_init(struct smscore_device_t *coredev)
|
||||
{
|
||||
struct input_dev *input_dev;
|
||||
int board_id = smscore_get_board_id(coredev);
|
||||
|
||||
sms_log("Allocating input device");
|
||||
input_dev = input_allocate_device();
|
||||
|
@ -256,8 +258,7 @@ int sms_ir_init(struct smscore_device_t *coredev)
|
|||
}
|
||||
|
||||
coredev->ir.input_dev = input_dev;
|
||||
coredev->ir.ir_kb_type =
|
||||
sms_get_board(smscore_get_board_id(coredev))->ir_kb_type;
|
||||
coredev->ir.ir_kb_type = sms_get_board(board_id)->ir_kb_type;
|
||||
coredev->ir.keyboard_layout_map =
|
||||
keyboard_layout_maps[coredev->ir.ir_kb_type].
|
||||
keyboard_layout_map;
|
||||
|
@ -269,11 +270,15 @@ int sms_ir_init(struct smscore_device_t *coredev)
|
|||
coredev->ir.controller, coredev->ir.timeout);
|
||||
|
||||
snprintf(coredev->ir.name,
|
||||
IR_DEV_NAME_MAX_LEN,
|
||||
"SMS IR w/kbd type %d",
|
||||
coredev->ir.ir_kb_type);
|
||||
sizeof(coredev->ir.name),
|
||||
"SMS IR (%s)",
|
||||
sms_get_board(board_id)->name);
|
||||
|
||||
strlcpy(coredev->ir.phys, coredev->devpath, sizeof(coredev->ir.phys));
|
||||
strlcat(coredev->ir.phys, "/ir0", sizeof(coredev->ir.phys));
|
||||
|
||||
input_dev->name = coredev->ir.name;
|
||||
input_dev->phys = coredev->ir.name;
|
||||
input_dev->phys = coredev->ir.phys;
|
||||
input_dev->dev.parent = coredev->device;
|
||||
|
||||
/* Key press events only */
|
||||
|
|
|
@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#include <linux/input.h>
|
||||
|
||||
#define IR_DEV_NAME_MAX_LEN 23 /* "SMS IR kbd type nn\0" */
|
||||
#define IR_DEV_NAME_MAX_LEN 40
|
||||
#define IR_KEYBOARD_LAYOUT_SIZE 64
|
||||
#define IR_DEFAULT_TIMEOUT 100
|
||||
|
||||
|
@ -78,7 +78,8 @@ struct smscore_device_t;
|
|||
struct ir_t {
|
||||
struct input_dev *input_dev;
|
||||
enum ir_kb_type ir_kb_type;
|
||||
char name[IR_DEV_NAME_MAX_LEN+1];
|
||||
char name[IR_DEV_NAME_MAX_LEN + 1];
|
||||
char phys[32];
|
||||
u16 *keyboard_layout_map;
|
||||
u32 timeout;
|
||||
u32 controller;
|
||||
|
|
|
@ -352,8 +352,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
|
|||
params.num_buffers = MAX_BUFFERS;
|
||||
params.sendrequest_handler = smsusb_sendrequest;
|
||||
params.context = dev;
|
||||
snprintf(params.devpath, sizeof(params.devpath),
|
||||
"usb\\%d-%s", dev->udev->bus->busnum, dev->udev->devpath);
|
||||
usb_make_path(dev->udev, params.devpath, sizeof(params.devpath));
|
||||
|
||||
/* register in smscore */
|
||||
rc = smscore_register_device(¶ms, &dev->coredev);
|
||||
|
|
Loading…
Reference in a new issue