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
Kirill Smelkov
linux
Commits
f99dad30
Commit
f99dad30
authored
Feb 06, 2004
by
Benjamin Herrenschmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ADB: Minor fix, autopoll list could be lost on a failed bus reset
parent
79d09548
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
drivers/macintosh/adb.c
drivers/macintosh/adb.c
+5
-4
No files found.
drivers/macintosh/adb.c
View file @
f99dad30
...
@@ -83,6 +83,7 @@ static pid_t adb_probe_task_pid;
...
@@ -83,6 +83,7 @@ static pid_t adb_probe_task_pid;
static
DECLARE_MUTEX
(
adb_probe_mutex
);
static
DECLARE_MUTEX
(
adb_probe_mutex
);
static
struct
completion
adb_probe_task_comp
;
static
struct
completion
adb_probe_task_comp
;
static
int
sleepy_trackpad
;
static
int
sleepy_trackpad
;
static
int
autopoll_devs
;
int
__adb_probe_sync
;
int
__adb_probe_sync
;
#ifdef CONFIG_PMAC_PBOOK
#ifdef CONFIG_PMAC_PBOOK
...
@@ -379,7 +380,7 @@ adb_notify_sleep(struct pmu_sleep_notifier *self, int when)
...
@@ -379,7 +380,7 @@ adb_notify_sleep(struct pmu_sleep_notifier *self, int when)
static
int
static
int
do_adb_reset_bus
(
void
)
do_adb_reset_bus
(
void
)
{
{
int
ret
,
nret
,
devs
;
int
ret
,
nret
;
if
(
adb_controller
==
NULL
)
if
(
adb_controller
==
NULL
)
return
-
ENXIO
;
return
-
ENXIO
;
...
@@ -390,7 +391,7 @@ do_adb_reset_bus(void)
...
@@ -390,7 +391,7 @@ do_adb_reset_bus(void)
nret
=
notifier_call_chain
(
&
adb_client_list
,
ADB_MSG_PRE_RESET
,
NULL
);
nret
=
notifier_call_chain
(
&
adb_client_list
,
ADB_MSG_PRE_RESET
,
NULL
);
if
(
nret
&
NOTIFY_STOP_MASK
)
{
if
(
nret
&
NOTIFY_STOP_MASK
)
{
if
(
adb_controller
->
autopoll
)
if
(
adb_controller
->
autopoll
)
adb_controller
->
autopoll
(
devs
);
adb_controller
->
autopoll
(
autopoll_
devs
);
return
-
EBUSY
;
return
-
EBUSY
;
}
}
...
@@ -416,9 +417,9 @@ do_adb_reset_bus(void)
...
@@ -416,9 +417,9 @@ do_adb_reset_bus(void)
}
}
if
(
!
ret
)
{
if
(
!
ret
)
{
devs
=
adb_scan_bus
();
autopoll_
devs
=
adb_scan_bus
();
if
(
adb_controller
->
autopoll
)
if
(
adb_controller
->
autopoll
)
adb_controller
->
autopoll
(
devs
);
adb_controller
->
autopoll
(
autopoll_
devs
);
}
}
up
(
&
adb_handler_sem
);
up
(
&
adb_handler_sem
);
...
...
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