diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-02-04 14:11:04 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-02-04 14:11:04 +1100 |
| commit | 3c812e75159797e730cdf5faa53b58ef9a4336da (patch) | |
| tree | 7e542b7294db4967fa3f20e834d70f9b70fefea2 /block/genhd.c | |
| parent | 01ae1d78d3d7977bbde8c54bdec1f851ce128e78 (diff) | |
| parent | 1c631f58d55a527fa0f5c83277c9b724c9983c38 (diff) | |
| download | linux-next-3c812e75159797e730cdf5faa53b58ef9a4336da.tar.gz | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'block/genhd.c')
| -rw-r--r-- | block/genhd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/genhd.c b/block/genhd.c index 9f42526b4d62..eb05dfc1dffe 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -877,7 +877,7 @@ static int show_partition(struct seq_file *seqf, void *v) char buf[BDEVNAME_SIZE]; /* Don't show non-partitionable removeable devices or empty devices */ - if (!get_capacity(sgp) || (!disk_max_parts(sgp) && + if (!get_capacity(sgp) || (!(disk_max_parts(sgp) > 1) && (sgp->flags & GENHD_FL_REMOVABLE))) return 0; if (sgp->flags & GENHD_FL_SUPPRESS_PARTITION_INFO) |