projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d73460d
)
PCI Hotplug: cpqhp_pushbutton_thread(): remove a pointless if() check
author
Adrian Bunk
<bunk@kernel.org>
Wed, 24 Oct 2007 16:25:00 +0000
(18:25 +0200)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Mon, 5 Nov 2007 21:35:17 +0000
(13:35 -0800)
The Coverity checker spotted that we'd have already oops'ed if "ctrl"
was NULL.
Additionally, "func" had just been checked for not being NULL.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/pci/hotplug/cpqphp_ctrl.c
patch
|
blob
|
history
diff --git
a/drivers/pci/hotplug/cpqphp_ctrl.c
b/drivers/pci/hotplug/cpqphp_ctrl.c
index
3ef0a48
..
856d57b
100644
(file)
--- a/
drivers/pci/hotplug/cpqphp_ctrl.c
+++ b/
drivers/pci/hotplug/cpqphp_ctrl.c
@@
-1931,16
+1931,14
@@
void cpqhp_pushbutton_thread(unsigned long slot)
return ;
}
- if (func != NULL && ctrl != NULL) {
- if (cpqhp_process_SS(ctrl, func) != 0) {
- amber_LED_on (ctrl, hp_slot);
- green_LED_on (ctrl, hp_slot);
-
- set_SOGO(ctrl);
+ if (cpqhp_process_SS(ctrl, func) != 0) {
+ amber_LED_on(ctrl, hp_slot);
+ green_LED_on(ctrl, hp_slot);
- /* Wait for SOBS to be unset */
- wait_for_ctrl_irq (ctrl);
- }
+ set_SOGO(ctrl);
+
+ /* Wait for SOBS to be unset */
+ wait_for_ctrl_irq(ctrl);
}
p_slot->state = STATIC_STATE;