Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
3136baf8
Commit
3136baf8
authored
Oct 17, 2010
by
Dmitry Torokhov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-linus' into next
parents
1d02ad43
ca047fed
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
17 deletions
+34
-17
drivers/input/joydev.c
drivers/input/joydev.c
+3
-0
drivers/input/misc/uinput.c
drivers/input/misc/uinput.c
+7
-0
drivers/input/mouse/bcm5974.c
drivers/input/mouse/bcm5974.c
+8
-4
drivers/input/serio/i8042.c
drivers/input/serio/i8042.c
+1
-1
drivers/input/tablet/wacom_sys.c
drivers/input/tablet/wacom_sys.c
+12
-11
drivers/input/tablet/wacom_wac.c
drivers/input/tablet/wacom_wac.c
+3
-1
No files found.
drivers/input/joydev.c
View file @
3136baf8
...
...
@@ -483,6 +483,9 @@ static int joydev_handle_JSIOCSAXMAP(struct joydev *joydev,
memcpy
(
joydev
->
abspam
,
abspam
,
len
);
for
(
i
=
0
;
i
<
joydev
->
nabs
;
i
++
)
joydev
->
absmap
[
joydev
->
abspam
[
i
]]
=
i
;
out:
kfree
(
abspam
);
return
retval
;
...
...
drivers/input/misc/uinput.c
View file @
3136baf8
...
...
@@ -404,6 +404,13 @@ static int uinput_setup_device(struct uinput_device *udev, const char __user *bu
retval
=
uinput_validate_absbits
(
dev
);
if
(
retval
<
0
)
goto
exit
;
if
(
test_bit
(
ABS_MT_SLOT
,
dev
->
absbit
))
{
int
nslot
=
input_abs_get_max
(
dev
,
ABS_MT_SLOT
)
+
1
;
input_mt_create_slots
(
dev
,
nslot
);
input_set_events_per_packet
(
dev
,
6
*
nslot
);
}
else
if
(
test_bit
(
ABS_MT_POSITION_X
,
dev
->
absbit
))
{
input_set_events_per_packet
(
dev
,
60
);
}
}
udev
->
state
=
UIST_SETUP_COMPLETE
;
...
...
drivers/input/mouse/bcm5974.c
View file @
3136baf8
...
...
@@ -337,10 +337,14 @@ static void report_finger_data(struct input_dev *input,
const
struct
bcm5974_config
*
cfg
,
const
struct
tp_finger
*
f
)
{
input_report_abs
(
input
,
ABS_MT_TOUCH_MAJOR
,
raw2int
(
f
->
force_major
));
input_report_abs
(
input
,
ABS_MT_TOUCH_MINOR
,
raw2int
(
f
->
force_minor
));
input_report_abs
(
input
,
ABS_MT_WIDTH_MAJOR
,
raw2int
(
f
->
size_major
));
input_report_abs
(
input
,
ABS_MT_WIDTH_MINOR
,
raw2int
(
f
->
size_minor
));
input_report_abs
(
input
,
ABS_MT_TOUCH_MAJOR
,
raw2int
(
f
->
force_major
)
<<
1
);
input_report_abs
(
input
,
ABS_MT_TOUCH_MINOR
,
raw2int
(
f
->
force_minor
)
<<
1
);
input_report_abs
(
input
,
ABS_MT_WIDTH_MAJOR
,
raw2int
(
f
->
size_major
)
<<
1
);
input_report_abs
(
input
,
ABS_MT_WIDTH_MINOR
,
raw2int
(
f
->
size_minor
)
<<
1
);
input_report_abs
(
input
,
ABS_MT_ORIENTATION
,
MAX_FINGER_ORIENTATION
-
raw2int
(
f
->
orientation
));
input_report_abs
(
input
,
ABS_MT_POSITION_X
,
raw2int
(
f
->
abs_x
));
...
...
drivers/input/serio/i8042.c
View file @
3136baf8
...
...
@@ -1485,8 +1485,8 @@ static int __init i8042_init(void)
static
void
__exit
i8042_exit
(
void
)
{
platform_driver_unregister
(
&
i8042_driver
);
platform_device_unregister
(
i8042_platform_device
);
platform_driver_unregister
(
&
i8042_driver
);
i8042_platform_exit
();
panic_blink
=
NULL
;
...
...
drivers/input/tablet/wacom_sys.c
View file @
3136baf8
...
...
@@ -103,27 +103,26 @@ static void wacom_sys_irq(struct urb *urb)
static
int
wacom_open
(
struct
input_dev
*
dev
)
{
struct
wacom
*
wacom
=
input_get_drvdata
(
dev
);
int
retval
=
0
;
mutex_lock
(
&
wacom
->
lock
);
wacom
->
irq
->
dev
=
wacom
->
usbdev
;
if
(
usb_autopm_get_interface
(
wacom
->
intf
)
<
0
)
{
mutex_unlock
(
&
wacom
->
lock
);
if
(
usb_autopm_get_interface
(
wacom
->
intf
)
<
0
)
return
-
EIO
;
}
mutex_lock
(
&
wacom
->
lock
);
if
(
usb_submit_urb
(
wacom
->
irq
,
GFP_KERNEL
))
{
usb_autopm_put_interface
(
wacom
->
intf
);
mutex_unlock
(
&
wacom
->
lock
);
return
-
EIO
;
retval
=
-
EIO
;
goto
out
;
}
wacom
->
open
=
true
;
wacom
->
intf
->
needs_remote_wakeup
=
1
;
out:
mutex_unlock
(
&
wacom
->
lock
);
return
0
;
if
(
retval
)
usb_autopm_put_interface
(
wacom
->
intf
);
return
retval
;
}
static
void
wacom_close
(
struct
input_dev
*
dev
)
...
...
@@ -135,6 +134,8 @@ static void wacom_close(struct input_dev *dev)
wacom
->
open
=
false
;
wacom
->
intf
->
needs_remote_wakeup
=
0
;
mutex_unlock
(
&
wacom
->
lock
);
usb_autopm_put_interface
(
wacom
->
intf
);
}
static
int
wacom_parse_hid
(
struct
usb_interface
*
intf
,
struct
hid_descriptor
*
hid_desc
,
...
...
drivers/input/tablet/wacom_wac.c
View file @
3136baf8
...
...
@@ -442,8 +442,10 @@ static void wacom_intuos_general(struct wacom_wac *wacom)
/* general pen packet */
if
((
data
[
1
]
&
0xb8
)
==
0xa0
)
{
t
=
(
data
[
6
]
<<
2
)
|
((
data
[
7
]
>>
6
)
&
3
);
if
(
features
->
type
>=
INTUOS4S
&&
features
->
type
<=
INTUOS4L
)
if
((
features
->
type
>=
INTUOS4S
&&
features
->
type
<=
INTUOS4L
)
||
features
->
type
==
WACOM_21UX2
)
{
t
=
(
t
<<
1
)
|
(
data
[
1
]
&
1
);
}
input_report_abs
(
input
,
ABS_PRESSURE
,
t
);
input_report_abs
(
input
,
ABS_TILT_X
,
((
data
[
7
]
<<
1
)
&
0x7e
)
|
(
data
[
8
]
>>
7
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment