[Title] modified usb touchscreen device name

[Type] feature
[Module] Emulator / touch
[Priority] minor
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/drivers/maru/maru_touchscreen.c b/drivers/maru/maru_touchscreen.c
index 5adea09937472d25cddeea5c5ca2053fc05842b9..d77a0cbb1222ee95f629cb5cf4e2f6efdd4d160d 100644 (file)
--- 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 d214e170832d40bc9598744062e638c2f4c7834f..2d23fd5fe59dc5f3c41445f97f7ee638f936fcb5 100755 (executable)
--- 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);
        }