Merge tag 'for-linus-20121219' of git://git.infradead.org/linux-mtd

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / mtd / nand / sh_flctl.c

diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index 2a21596..57b3971 100644 (file)
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -896,7 +896,9 @@ static void flctl_select_chip(struct mtd_info *mtd, int chipnr)
 
                if (!flctl->qos_request) {
                        ret = dev_pm_qos_add_request(&flctl->pdev->dev,
-                                                       &flctl->pm_qos, 100);
+                                                       &flctl->pm_qos,
+                                                       DEV_PM_QOS_LATENCY,
+                                                       100);
                        if (ret < 0)
                                dev_err(&flctl->pdev->dev,
                                        "PM QoS request failed: %d\n", ret);