diff options
| author | Julia Lawall <julia@diku.dk> | 2009-07-13 22:43:41 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-07-17 08:29:58 +0200 |
| commit | 8f47428704c2fd6f787a6f340071b9c338b65803 (patch) | |
| tree | 15318bc754cabdda0752ae69193415e5868a5674 /drivers/block/ataflop.c | |
| parent | block: fix failfast merge testing in elv_rq_merge_ok() (diff) | |
| download | linux-8f47428704c2fd6f787a6f340071b9c338b65803.tar.xz linux-8f47428704c2fd6f787a6f340071b9c338b65803.zip | |
ataflop: adjust NULL test
dtp is derefenced on the lines above the test !dtp, and so it cannot be
NULL at this point.
A simplified version of the semantic match that finds this problem is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r@
expression x,E,E1;
identifier f,l;
position p1,p2;
@@
*x@p1->f = E1;
... when != x = E
when != goto l;
(
*x@p2 == NULL
|
*x@p2 != NULL
)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/block/ataflop.c')
| -rw-r--r-- | drivers/block/ataflop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c index f5e7180d7f47..3ff02941b3dd 100644 --- a/drivers/block/ataflop.c +++ b/drivers/block/ataflop.c @@ -1627,7 +1627,7 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, drive, dtp->blocks, dtp->spt, dtp->stretch); /* sanity check */ - if (!dtp || setprm.track != dtp->blocks/dtp->spt/2 || + if (setprm.track != dtp->blocks/dtp->spt/2 || setprm.head != 2) { redo_fd_request(); return -EINVAL; |