diff options
author | Joe Perches <joe@perches.com> | 2013-09-11 17:25:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 18:59:34 -0400 |
commit | 666dc7c90ab2531f7f0f13ef21afab8cd61478a9 (patch) | |
tree | d19e6bfc3fe89d160221f76f3ad1330f5bbf947c /drivers/block | |
parent | f3ded788bbd95af344a34ae40d1ab578cb76c7fb (diff) |
pktcdvd: fix defective misuses of pkt_<level>
Fix thinkos where pkt_<level> needs a valid pktcdvd_device * and the
pointer is known to be NULL.
Signed-off-by: Joe Perches <joe@perches.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com> (go smatch!)
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/pktcdvd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 29a5194ab147..56188475cfd3 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
@@ -2360,8 +2360,8 @@ static void pkt_make_request(struct request_queue *q, struct bio *bio) | |||
2360 | 2360 | ||
2361 | pd = q->queuedata; | 2361 | pd = q->queuedata; |
2362 | if (!pd) { | 2362 | if (!pd) { |
2363 | pkt_err(pd, "%s incorrect request queue\n", | 2363 | pr_err("%s incorrect request queue\n", |
2364 | bdevname(bio->bi_bdev, b)); | 2364 | bdevname(bio->bi_bdev, b)); |
2365 | goto end_io; | 2365 | goto end_io; |
2366 | } | 2366 | } |
2367 | 2367 | ||
@@ -2841,7 +2841,7 @@ static int pkt_remove_dev(dev_t pkt_dev) | |||
2841 | break; | 2841 | break; |
2842 | } | 2842 | } |
2843 | if (idx == MAX_WRITERS) { | 2843 | if (idx == MAX_WRITERS) { |
2844 | pkt_dbg(1, pd, "dev not setup\n"); | 2844 | pr_debug("dev not setup\n"); |
2845 | ret = -ENXIO; | 2845 | ret = -ENXIO; |
2846 | goto out; | 2846 | goto out; |
2847 | } | 2847 | } |