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
64d163db
Commit
64d163db
authored
Oct 29, 2002
by
Greg Kroah-Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
USB: drivers/usb fixups due to USB structure changes.
parent
40509e42
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
drivers/usb/image/microtek.c
drivers/usb/image/microtek.c
+1
-1
drivers/usb/media/stv680.c
drivers/usb/media/stv680.c
+1
-1
drivers/usb/misc/speedtouch.c
drivers/usb/misc/speedtouch.c
+1
-1
drivers/usb/misc/uss720.c
drivers/usb/misc/uss720.c
+4
-4
No files found.
drivers/usb/image/microtek.c
View file @
64d163db
...
@@ -914,7 +914,7 @@ static int mts_usb_probe (struct usb_interface *intf,
...
@@ -914,7 +914,7 @@ static int mts_usb_probe (struct usb_interface *intf,
return
-
ENODEV
;
return
-
ENODEV
;
}
}
result
=
usb_set_interface
(
dev
,
altsetting
->
bInterfaceNumber
,
0
);
result
=
usb_set_interface
(
dev
,
altsetting
->
desc
.
bInterfaceNumber
,
0
);
MTS_DEBUG
(
"usb_set_interface returned %d.
\n
"
,
result
);
MTS_DEBUG
(
"usb_set_interface returned %d.
\n
"
,
result
);
switch
(
result
)
switch
(
result
)
...
...
drivers/usb/media/stv680.c
View file @
64d163db
...
@@ -1451,7 +1451,7 @@ static struct video_device stv680_template = {
...
@@ -1451,7 +1451,7 @@ static struct video_device stv680_template = {
static
int
stv680_probe
(
struct
usb_interface
*
intf
,
const
struct
usb_device_id
*
id
)
static
int
stv680_probe
(
struct
usb_interface
*
intf
,
const
struct
usb_device_id
*
id
)
{
{
struct
usb_device
*
dev
=
interface_to_usbdev
(
intf
);
struct
usb_device
*
dev
=
interface_to_usbdev
(
intf
);
struct
usb_
interface_descriptor
*
interface
;
struct
usb_
host_interface
*
interface
;
struct
usb_stv
*
stv680
;
struct
usb_stv
*
stv680
;
char
*
camera_name
=
NULL
;
char
*
camera_name
=
NULL
;
...
...
drivers/usb/misc/speedtouch.c
View file @
64d163db
...
@@ -917,7 +917,7 @@ static int udsl_usb_ioctl (struct usb_interface *intf, unsigned int code, void *
...
@@ -917,7 +917,7 @@ static int udsl_usb_ioctl (struct usb_interface *intf, unsigned int code, void *
static
int
udsl_usb_probe
(
struct
usb_interface
*
intf
,
const
struct
usb_device_id
*
id
)
static
int
udsl_usb_probe
(
struct
usb_interface
*
intf
,
const
struct
usb_device_id
*
id
)
{
{
struct
usb_device
*
dev
=
interface_to_usbdev
(
intf
);
struct
usb_device
*
dev
=
interface_to_usbdev
(
intf
);
int
ifnum
=
intf
->
altsetting
->
bInterfaceNumber
;
int
ifnum
=
intf
->
altsetting
->
desc
.
bInterfaceNumber
;
int
i
;
int
i
;
unsigned
char
mac
[
6
];
unsigned
char
mac
[
6
];
unsigned
char
mac_str
[
13
];
unsigned
char
mac_str
[
13
];
...
...
drivers/usb/misc/uss720.c
View file @
64d163db
...
@@ -549,8 +549,8 @@ static int uss720_probe(struct usb_interface *intf,
...
@@ -549,8 +549,8 @@ static int uss720_probe(struct usb_interface *intf,
const
struct
usb_device_id
*
id
)
const
struct
usb_device_id
*
id
)
{
{
struct
usb_device
*
usbdev
=
interface_to_usbdev
(
intf
);
struct
usb_device
*
usbdev
=
interface_to_usbdev
(
intf
);
struct
usb_
interface_descriptor
*
interface
;
struct
usb_
host_interface
*
interface
;
struct
usb_
endpoint_descriptor
*
endpoint
;
struct
usb_
host_endpoint
*
endpoint
;
struct
parport_uss720_private
*
priv
;
struct
parport_uss720_private
*
priv
;
struct
parport
*
pp
;
struct
parport
*
pp
;
int
i
;
int
i
;
...
@@ -562,7 +562,7 @@ static int uss720_probe(struct usb_interface *intf,
...
@@ -562,7 +562,7 @@ static int uss720_probe(struct usb_interface *intf,
if
(
intf
->
num_altsetting
!=
3
)
if
(
intf
->
num_altsetting
!=
3
)
return
-
ENODEV
;
return
-
ENODEV
;
i
=
usb_set_interface
(
usbdev
,
intf
->
altsetting
->
bInterfaceNumber
,
2
);
i
=
usb_set_interface
(
usbdev
,
intf
->
altsetting
->
desc
.
bInterfaceNumber
,
2
);
printk
(
KERN_DEBUG
"uss720: set inteface result %d
\n
"
,
i
);
printk
(
KERN_DEBUG
"uss720: set inteface result %d
\n
"
,
i
);
interface
=
&
intf
->
altsetting
[
2
];
interface
=
&
intf
->
altsetting
[
2
];
...
@@ -593,7 +593,7 @@ static int uss720_probe(struct usb_interface *intf,
...
@@ -593,7 +593,7 @@ static int uss720_probe(struct usb_interface *intf,
priv
->
reg
[
0
],
priv
->
reg
[
1
],
priv
->
reg
[
2
],
priv
->
reg
[
3
],
priv
->
reg
[
4
],
priv
->
reg
[
5
],
priv
->
reg
[
6
]);
priv
->
reg
[
0
],
priv
->
reg
[
1
],
priv
->
reg
[
2
],
priv
->
reg
[
3
],
priv
->
reg
[
4
],
priv
->
reg
[
5
],
priv
->
reg
[
6
]);
endpoint
=
&
interface
->
endpoint
[
2
];
endpoint
=
&
interface
->
endpoint
[
2
];
printk
(
KERN_DEBUG
"uss720: epaddr %d interval %d
\n
"
,
endpoint
->
bEndpointAddress
,
endpoint
->
bInterval
);
printk
(
KERN_DEBUG
"uss720: epaddr %d interval %d
\n
"
,
endpoint
->
desc
.
bEndpointAddress
,
endpoint
->
desc
.
bInterval
);
#if 0
#if 0
priv->irqpipe = usb_rcvctrlpipe(usbdev, endpoint->bEndpointAddress);
priv->irqpipe = usb_rcvctrlpipe(usbdev, endpoint->bEndpointAddress);
i = usb_request_irq(usbdev, priv->irqpipe,
i = usb_request_irq(usbdev, priv->irqpipe,
...
...
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