summaryrefslogtreecommitdiffstats
path: root/drivers/block/paride/pf.c
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-06-29 02:24:32 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-29 10:26:20 -0700
commit8e53cfc8f20345713fab7e290e19514a8032bb06 (patch)
tree7e7cdff1f59ac6c1265626ea5d2592e59f41b222 /drivers/block/paride/pf.c
parent85bd84345f64cb953101ddd8ab1340dde351c579 (diff)
downloadblackbird-op-linux-8e53cfc8f20345713fab7e290e19514a8032bb06.tar.gz
blackbird-op-linux-8e53cfc8f20345713fab7e290e19514a8032bb06.zip
[PATCH] Deref in drivers/block/paride/pf.c
Another possible dereference detected by coverity (id #759). pf_probe() might call pf_identify() which might call get_capacity() which dereferences pf->disk Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block/paride/pf.c')
-rw-r--r--drivers/block/paride/pf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index 852b564e903a..1a9dee19efcf 100644
--- 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
OpenPOWER on IntegriCloud