Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
155ec9e6
Commit
155ec9e6
authored
Mar 08, 2006
by
Mauro Carvalho Chehab
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'work-fixes'
parents
8e2cc1af
8a59822f
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
12 additions
and
9 deletions
+12
-9
drivers/media/dvb/dvb-core/demux.h
drivers/media/dvb/dvb-core/demux.h
+1
-1
drivers/media/dvb/dvb-usb/dvb-usb-init.c
drivers/media/dvb/dvb-usb/dvb-usb-init.c
+1
-1
drivers/media/dvb/dvb-usb/dvb-usb.h
drivers/media/dvb/dvb-usb/dvb-usb.h
+1
-1
drivers/media/dvb/ttpci/av7110.c
drivers/media/dvb/ttpci/av7110.c
+1
-1
drivers/media/dvb/ttpci/av7110_hw.c
drivers/media/dvb/ttpci/av7110_hw.c
+3
-0
drivers/media/video/cpia.c
drivers/media/video/cpia.c
+1
-1
drivers/media/video/videocodec.h
drivers/media/video/videocodec.h
+1
-1
drivers/media/video/zr36050.c
drivers/media/video/zr36050.c
+1
-1
drivers/media/video/zr36060.c
drivers/media/video/zr36060.c
+1
-1
drivers/media/video/zr36120_i2c.c
drivers/media/video/zr36120_i2c.c
+1
-1
No files found.
drivers/media/dvb/dvb-core/demux.h
View file @
155ec9e6
...
...
@@ -216,7 +216,7 @@ struct dmx_frontend {
/*--------------------------------------------------------------------------*/
/*
* Flags OR'ed in the capabilites field of struct dmx_demux.
* Flags OR'ed in the capabilit
i
es field of struct dmx_demux.
*/
#define DMX_TS_FILTERING 1
...
...
drivers/media/dvb/dvb-usb/dvb-usb-init.c
View file @
155ec9e6
...
...
@@ -47,7 +47,7 @@ static int dvb_usb_init(struct dvb_usb_device *d)
d
->
state
=
DVB_USB_STATE_INIT
;
/* check the capabilites and set appropriate variables */
/* check the capabilit
i
es and set appropriate variables */
/* speed - when running at FULL speed we need a HW PID filter */
if
(
d
->
udev
->
speed
==
USB_SPEED_FULL
&&
!
(
d
->
props
.
caps
&
DVB_USB_HAS_PID_FILTER
))
{
...
...
drivers/media/dvb/dvb-usb/dvb-usb.h
View file @
155ec9e6
...
...
@@ -87,7 +87,7 @@ struct dvb_usb_device;
/**
* struct dvb_usb_properties - properties of a dvb-usb-device
* @caps: capabilites of the DVB USB device.
* @caps: capabilit
i
es of the DVB USB device.
* @pid_filter_count: number of PID filter position in the optional hardware
* PID-filter.
*
...
...
drivers/media/dvb/ttpci/av7110.c
View file @
155ec9e6
...
...
@@ -1439,7 +1439,7 @@ static int check_firmware(struct av7110* av7110)
len
=
ntohl
(
*
(
u32
*
)
ptr
);
ptr
+=
4
;
if
(
len
>=
512
)
{
printk
(
"dvb-ttpci: dpram file is way to big.
\n
"
);
printk
(
"dvb-ttpci: dpram file is way to
o
big.
\n
"
);
return
-
EINVAL
;
}
if
(
crc
!=
crc32_le
(
0
,
ptr
,
len
))
{
...
...
drivers/media/dvb/ttpci/av7110_hw.c
View file @
155ec9e6
...
...
@@ -245,6 +245,9 @@ int av7110_bootarm(struct av7110 *av7110)
/* test DEBI */
iwdebi
(
av7110
,
DEBISWAP
,
DPRAM_BASE
,
0x76543210
,
4
);
/* FIXME: Why does Nexus CA require 2x iwdebi for first init? */
iwdebi
(
av7110
,
DEBISWAP
,
DPRAM_BASE
,
0x76543210
,
4
);
if
((
ret
=
irdebi
(
av7110
,
DEBINOSWAP
,
DPRAM_BASE
,
0
,
4
))
!=
0x10325476
)
{
printk
(
KERN_ERR
"dvb-ttpci: debi test in av7110_bootarm() failed: "
"%08x != %08x (check your BIOS 'Plug&Play OS' settings)
\n
"
,
...
...
drivers/media/video/cpia.c
View file @
155ec9e6
...
...
@@ -3369,7 +3369,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
//DBG("cpia_ioctl: %u\n", ioctlnr);
switch
(
ioctlnr
)
{
/* query capabilites */
/* query capabilit
i
es */
case
VIDIOCGCAP
:
{
struct
video_capability
*
b
=
arg
;
...
...
drivers/media/video/videocodec.h
View file @
155ec9e6
...
...
@@ -56,7 +56,7 @@
the slave is bound to it). Otherwise it doesn't need this functions and
therfor they may not be initialized.
The other fuctions are just for convenience, as they are for s
h
ure used by
The other fuctions are just for convenience, as they are for sure used by
most/all of the codecs. The last ones may be ommited, too.
See the structure declaration below for more information and which data has
...
...
drivers/media/video/zr36050.c
View file @
155ec9e6
...
...
@@ -159,7 +159,7 @@ zr36050_wait_end (struct zr36050 *ptr)
while
(
!
(
zr36050_read_status1
(
ptr
)
&
0x4
))
{
udelay
(
1
);
if
(
i
++
>
200000
)
{
// 200ms, there is for s
h
ure something wrong!!!
if
(
i
++
>
200000
)
{
// 200ms, there is for sure something wrong!!!
dprintk
(
1
,
"%s: timout at wait_end (last status: 0x%02x)
\n
"
,
ptr
->
name
,
ptr
->
status1
);
...
...
drivers/media/video/zr36060.c
View file @
155ec9e6
...
...
@@ -161,7 +161,7 @@ zr36060_wait_end (struct zr36060 *ptr)
while
(
zr36060_read_status
(
ptr
)
&
ZR060_CFSR_Busy
)
{
udelay
(
1
);
if
(
i
++
>
200000
)
{
// 200ms, there is for s
h
ure something wrong!!!
if
(
i
++
>
200000
)
{
// 200ms, there is for sure something wrong!!!
dprintk
(
1
,
"%s: timout at wait_end (last status: 0x%02x)
\n
"
,
ptr
->
name
,
ptr
->
status
);
...
...
drivers/media/video/zr36120_i2c.c
View file @
155ec9e6
...
...
@@ -65,7 +65,7 @@ void attach_inform(struct i2c_bus *bus, int id)
case
I2C_DRIVERID_VIDEODECODER
:
DEBUG
(
printk
(
CARD_INFO
"decoder attached
\n
"
,
CARD
));
/* fetch the capabilites of the decoder */
/* fetch the capabilit
i
es of the decoder */
rv
=
i2c_control_device
(
&
ztv
->
i2c
,
I2C_DRIVERID_VIDEODECODER
,
DECODER_GET_CAPABILITIES
,
&
dc
);
if
(
rv
)
{
DEBUG
(
printk
(
CARD_DEBUG
"decoder is not V4L aware!
\n
"
,
CARD
));
...
...
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