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
dba396ff
Commit
dba396ff
authored
May 19, 2004
by
Andrew Morton
Committed by
Linus Torvalds
May 19, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] fix radio-cadet `readq' namespace clash
It conflicts with the readq() I/O function.
parent
01db63f2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
drivers/media/radio/radio-cadet.c
drivers/media/radio/radio-cadet.c
+4
-4
No files found.
drivers/media/radio/radio-cadet.c
View file @
dba396ff
...
@@ -45,7 +45,7 @@ static int users=0;
...
@@ -45,7 +45,7 @@ static int users=0;
static
int
curtuner
=
0
;
static
int
curtuner
=
0
;
static
int
tunestat
=
0
;
static
int
tunestat
=
0
;
static
int
sigstrength
=
0
;
static
int
sigstrength
=
0
;
static
wait_queue_head_t
read
q
;
static
wait_queue_head_t
read
_queue
;
struct
timer_list
tunertimer
,
rdstimer
,
readtimer
;
struct
timer_list
tunertimer
,
rdstimer
,
readtimer
;
static
__u8
rdsin
=
0
,
rdsout
=
0
,
rdsstat
=
0
;
static
__u8
rdsin
=
0
,
rdsout
=
0
,
rdsstat
=
0
;
static
unsigned
char
rdsbuf
[
RDS_BUFFER
];
static
unsigned
char
rdsbuf
[
RDS_BUFFER
];
...
@@ -309,7 +309,7 @@ void cadet_handler(unsigned long data)
...
@@ -309,7 +309,7 @@ void cadet_handler(unsigned long data)
* Service pending read
* Service pending read
*/
*/
if
(
rdsin
!=
rdsout
)
if
(
rdsin
!=
rdsout
)
wake_up_interruptible
(
&
read
q
);
wake_up_interruptible
(
&
read
_queue
);
/*
/*
* Clean up and exit
* Clean up and exit
...
@@ -343,7 +343,7 @@ static ssize_t cadet_read(struct file *file, char *data,
...
@@ -343,7 +343,7 @@ static ssize_t cadet_read(struct file *file, char *data,
if
(
rdsin
==
rdsout
)
{
if
(
rdsin
==
rdsout
)
{
if
(
file
->
f_flags
&
O_NONBLOCK
)
if
(
file
->
f_flags
&
O_NONBLOCK
)
return
-
EWOULDBLOCK
;
return
-
EWOULDBLOCK
;
interruptible_sleep_on
(
&
read
q
);
interruptible_sleep_on
(
&
read
_queue
);
}
}
while
(
i
<
count
&&
rdsin
!=
rdsout
)
while
(
i
<
count
&&
rdsin
!=
rdsout
)
readbuf
[
i
++
]
=
rdsbuf
[
rdsout
++
];
readbuf
[
i
++
]
=
rdsbuf
[
rdsout
++
];
...
@@ -473,7 +473,7 @@ static int cadet_open(struct inode *inode, struct file *file)
...
@@ -473,7 +473,7 @@ static int cadet_open(struct inode *inode, struct file *file)
if
(
users
)
if
(
users
)
return
-
EBUSY
;
return
-
EBUSY
;
users
++
;
users
++
;
init_waitqueue_head
(
&
read
q
);
init_waitqueue_head
(
&
read
_queue
);
return
0
;
return
0
;
}
}
...
...
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