Merge branch 'akpm-current/current'

[karo-tx-linux.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index e5cafa51567c9d589147523c8ab7b43504f9d725..ebb41feea35754525761edf815b7e3a994ab0a06 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -852,7 +852,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)