git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
block
/
paride
/
pf.c
diff --git
a/drivers/block/paride/pf.c
b/drivers/block/paride/pf.c
index
852b564
..
1a9dee1
100644
(file)
--- a/
drivers/block/paride/pf.c
+++ b/
drivers/block/paride/pf.c
@@
-707,7
+707,7
@@
static int pf_detect(void)
if (pi_init(pf->pi, 0, conf[D_PRT], conf[D_MOD],
conf[D_UNI], conf[D_PRO], conf[D_DLY],
pf_scratch, PI_PF, verbose, pf->name)) {
- if (
!pf_probe(pf) && pf->disk
) {
+ if (
pf->disk && !pf_probe(pf)
) {
pf->present = 1;
k++;
} else