From a0f33d334dd6a27a971382174f605b401bc8d0f1 Mon Sep 17 00:00:00 2001 From: "giwoong.kim" Date: Wed, 22 Aug 2012 21:55:04 +0900 Subject: [PATCH] [Title] modified usb touchscreen device name [Type] feature [Module] Emulator / touch [Priority] minor [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- drivers/maru/maru_touchscreen.c | 4 ++-- drivers/maru/maru_virtio_touchscreen.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/maru/maru_touchscreen.c b/drivers/maru/maru_touchscreen.c index 5adea0993747..d77a0cbb1222 100644 --- a/drivers/maru/maru_touchscreen.c +++ b/drivers/maru/maru_touchscreen.c @@ -1,5 +1,5 @@ /* - * Maru Virtual USB Touchscreen device driver + * Maru USB Touchscreen Device Driver * Based on drivers/input/tablet/wacom_sys.c: * * Copyright (c) 2011 Samsung Electronics Co., Ltd. All rights reserved. @@ -187,7 +187,7 @@ static int emul_touchscreen_probe(struct usb_interface *intf, const struct usb_d usb_make_path(usb_ts->usbdev, usb_ts->phys, sizeof(usb_ts->phys)); strlcat(usb_ts->phys, "/input0", sizeof(usb_ts->phys)); - usb_ts->emuldev->name = "Maru Virtual Touchscreen"; + usb_ts->emuldev->name = "Maru USB Touchscreen"; usb_to_input_id(usb_ts->usbdev, &usb_ts->emuldev->id); usb_ts->emuldev->dev.parent = &intf->dev; diff --git a/drivers/maru/maru_virtio_touchscreen.c b/drivers/maru/maru_virtio_touchscreen.c index d214e170832d..2d23fd5fe59d 100755 --- a/drivers/maru/maru_virtio_touchscreen.c +++ b/drivers/maru/maru_virtio_touchscreen.c @@ -1,5 +1,5 @@ /* - * Maru Virtual Virtio Touchscreen device driver + * Maru Virtio Touchscreen Device Driver * * Copyright (c) 2011 Samsung Electronics Co., Ltd. All rights reserved. * @@ -169,7 +169,6 @@ static int virtio_touchscreen_probe(struct virtio_device *vdev) /* thread */ vt->thread = kthread_run(run_touchscreen, vt, "vtouchscreen"); if (IS_ERR(vt->thread)) { - kfree(vt); return PTR_ERR(vt->thread); } -- 2.34.1