V4L/DVB (8937): em28xx: Fix and add some validations

[linux-2.6-omap-h63xx.git] / drivers / char / random.c

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 7ce1ac4baa6d81feccad163cb9c476edfb7278c9..6af435b89867a7bb99689871624989dd8de14e61 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -661,10 +661,10 @@ void add_disk_randomness(struct gendisk *disk)
        if (!disk || !disk->random)
                return;
        /* first major is 1, so we get >= 0x200 here */
-       DEBUG_ENT("disk event %d:%d\n", disk->major, disk->first_minor);
+       DEBUG_ENT("disk event %d:%d\n",
+                 MAJOR(disk_devt(disk)), MINOR(disk_devt(disk)));
 
-       add_timer_randomness(disk->random,
-                            0x100 + MKDEV(disk->major, disk->first_minor));
+       add_timer_randomness(disk->random, 0x100 + disk_devt(disk));
 }
 #endif