Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
linux-seco-imx
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Jira
Code
Merge requests
14
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Clea OS
bsp
nxp
linux-seco-imx
Commits
4d42e1bb
Commit
4d42e1bb
authored
18 years ago
by
Greg Kroah-Hartman
Browse files
Options
Downloads
Patches
Plain Diff
USB: fix __must_check warnings in drivers/usb/misc/
Signed-off-by:
Greg Kroah-Hartman
<
gregkh@suse.de
>
parent
1b21d5e1
Loading
Loading
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
drivers/usb/misc/cypress_cy7c63.c
+15
-4
15 additions, 4 deletions
drivers/usb/misc/cypress_cy7c63.c
drivers/usb/misc/cytherm.c
+26
-9
26 additions, 9 deletions
drivers/usb/misc/cytherm.c
drivers/usb/misc/usbled.c
+16
-4
16 additions, 4 deletions
drivers/usb/misc/usbled.c
with
57 additions
and
17 deletions
drivers/usb/misc/cypress_cy7c63.c
+
15
−
4
View file @
4d42e1bb
...
...
@@ -209,7 +209,7 @@ static int cypress_probe(struct usb_interface *interface,
dev
=
kzalloc
(
sizeof
(
*
dev
),
GFP_KERNEL
);
if
(
dev
==
NULL
)
{
dev_err
(
&
interface
->
dev
,
"Out of memory!
\n
"
);
goto
error
;
goto
error
_mem
;
}
dev
->
udev
=
usb_get_dev
(
interface_to_usbdev
(
interface
));
...
...
@@ -218,15 +218,26 @@ static int cypress_probe(struct usb_interface *interface,
usb_set_intfdata
(
interface
,
dev
);
/* create device attribute files */
device_create_file
(
&
interface
->
dev
,
&
dev_attr_port0
);
device_create_file
(
&
interface
->
dev
,
&
dev_attr_port1
);
retval
=
device_create_file
(
&
interface
->
dev
,
&
dev_attr_port0
);
if
(
retval
)
goto
error
;
retval
=
device_create_file
(
&
interface
->
dev
,
&
dev_attr_port1
);
if
(
retval
)
goto
error
;
/* let the user know that the device is now attached */
dev_info
(
&
interface
->
dev
,
"Cypress CY7C63xxx device now attached
\n
"
);
return
0
;
retval
=
0
;
error:
device_remove_file
(
&
interface
->
dev
,
&
dev_attr_port0
);
device_remove_file
(
&
interface
->
dev
,
&
dev_attr_port1
);
usb_set_intfdata
(
interface
,
NULL
);
usb_put_dev
(
dev
->
udev
);
kfree
(
dev
);
error_mem:
return
retval
;
}
...
...
This diff is collapsed.
Click to expand it.
drivers/usb/misc/cytherm.c
+
26
−
9
View file @
4d42e1bb
...
...
@@ -353,7 +353,7 @@ static int cytherm_probe(struct usb_interface *interface,
dev
=
kzalloc
(
sizeof
(
struct
usb_cytherm
),
GFP_KERNEL
);
if
(
dev
==
NULL
)
{
dev_err
(
&
interface
->
dev
,
"Out of memory
\n
"
);
goto
error
;
goto
error
_mem
;
}
dev
->
udev
=
usb_get_dev
(
udev
);
...
...
@@ -362,18 +362,35 @@ static int cytherm_probe(struct usb_interface *interface,
dev
->
brightness
=
0xFF
;
device_create_file
(
&
interface
->
dev
,
&
dev_attr_brightness
);
device_create_file
(
&
interface
->
dev
,
&
dev_attr_temp
);
device_create_file
(
&
interface
->
dev
,
&
dev_attr_button
);
device_create_file
(
&
interface
->
dev
,
&
dev_attr_port0
);
device_create_file
(
&
interface
->
dev
,
&
dev_attr_port1
);
retval
=
device_create_file
(
&
interface
->
dev
,
&
dev_attr_brightness
);
if
(
retval
)
goto
error
;
retval
=
device_create_file
(
&
interface
->
dev
,
&
dev_attr_temp
);
if
(
retval
)
goto
error
;
retval
=
device_create_file
(
&
interface
->
dev
,
&
dev_attr_button
);
if
(
retval
)
goto
error
;
retval
=
device_create_file
(
&
interface
->
dev
,
&
dev_attr_port0
);
if
(
retval
)
goto
error
;
retval
=
device_create_file
(
&
interface
->
dev
,
&
dev_attr_port1
);
if
(
retval
)
goto
error
;
dev_info
(
&
interface
->
dev
,
dev_info
(
&
interface
->
dev
,
"Cypress thermometer device now attached
\n
"
);
return
0
;
error:
error:
device_remove_file
(
&
interface
->
dev
,
&
dev_attr_brightness
);
device_remove_file
(
&
interface
->
dev
,
&
dev_attr_temp
);
device_remove_file
(
&
interface
->
dev
,
&
dev_attr_button
);
device_remove_file
(
&
interface
->
dev
,
&
dev_attr_port0
);
device_remove_file
(
&
interface
->
dev
,
&
dev_attr_port1
);
usb_set_intfdata
(
interface
,
NULL
);
usb_put_dev
(
dev
->
udev
);
kfree
(
dev
);
error_mem:
return
retval
;
}
...
...
This diff is collapsed.
Click to expand it.
drivers/usb/misc/usbled.c
+
16
−
4
View file @
4d42e1bb
...
...
@@ -108,22 +108,34 @@ static int led_probe(struct usb_interface *interface, const struct usb_device_id
dev
=
kzalloc
(
sizeof
(
struct
usb_led
),
GFP_KERNEL
);
if
(
dev
==
NULL
)
{
dev_err
(
&
interface
->
dev
,
"Out of memory
\n
"
);
goto
error
;
goto
error
_mem
;
}
dev
->
udev
=
usb_get_dev
(
udev
);
usb_set_intfdata
(
interface
,
dev
);
device_create_file
(
&
interface
->
dev
,
&
dev_attr_blue
);
device_create_file
(
&
interface
->
dev
,
&
dev_attr_red
);
device_create_file
(
&
interface
->
dev
,
&
dev_attr_green
);
retval
=
device_create_file
(
&
interface
->
dev
,
&
dev_attr_blue
);
if
(
retval
)
goto
error
;
retval
=
device_create_file
(
&
interface
->
dev
,
&
dev_attr_red
);
if
(
retval
)
goto
error
;
retval
=
device_create_file
(
&
interface
->
dev
,
&
dev_attr_green
);
if
(
retval
)
goto
error
;
dev_info
(
&
interface
->
dev
,
"USB LED device now attached
\n
"
);
return
0
;
error:
device_remove_file
(
&
interface
->
dev
,
&
dev_attr_blue
);
device_remove_file
(
&
interface
->
dev
,
&
dev_attr_red
);
device_remove_file
(
&
interface
->
dev
,
&
dev_attr_green
);
usb_set_intfdata
(
interface
,
NULL
);
usb_put_dev
(
dev
->
udev
);
kfree
(
dev
);
error_mem:
return
retval
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment