diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 15:48:51 +0300 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 15:48:51 +0300 |
commit | f11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch) | |
tree | 6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /drivers/block/cciss.c | |
parent | 429c42c9d246f5bda868495c09974312a0177328 (diff) | |
parent | aea187c46f7d03ce985e55eb1398d0776a15b928 (diff) | |
download | linux-f11cbd74c5ff3614f6390b4de67a6ffdc614c378.tar.xz |
Merge branch 'master' into for-2.6.34
Diffstat (limited to 'drivers/block/cciss.c')
-rw-r--r-- | drivers/block/cciss.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 8df23c732c46..86acdca5d0ce 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -337,6 +337,9 @@ static int cciss_seq_show(struct seq_file *seq, void *v) if (*pos > h->highest_lun) return 0; + if (drv == NULL) /* it's possible for h->drv[] to have holes. */ + return 0; + if (drv->heads == 0) return 0; |