Merge branches 'pm-sleep', 'pm-cpufreq', 'pm-core' and 'pm-opp'

[cascardo/linux.git] / block / partition-generic.c

diff --git a/block/partition-generic.c b/block/partition-generic.c
index d7eb77e..71d9ed9 100644 (file)
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -495,7 +495,6 @@ rescan:
        /* add partitions */
        for (p = 1; p < state->limit; p++) {
                sector_t size, from;
-               struct partition_meta_info *info = NULL;
 
                size = state->parts[p].size;
                if (!size)
@@ -530,8 +529,6 @@ rescan:
                        }
                }
 
-               if (state->parts[p].has_info)
-                       info = &state->parts[p].info;
                part = add_partition(disk, p, from, size,
                                     state->parts[p].flags,
                                     &state->parts[p].info);