]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
usb: otg: tegra: Enable id interrupts in resume
authorRakesh Bodla <rbodla@nvidia.com>
Thu, 14 Mar 2013 09:31:29 +0000 (15:01 +0530)
committerDan Willemsen <dwillemsen@nvidia.com>
Sat, 14 Sep 2013 20:03:05 +0000 (13:03 -0700)
Enable id interrupts in otg resume for boards which
support pmu vbus detection. Also removing the mutex
lock from interrupt context.

Bug 1245272

Change-Id: I9e0790909d9cff8c577ce5040776a44b2f03cb23
Signed-off-by: Rakesh Bodla <rbodla@nvidia.com>
Reviewed-on: http://git-master/r/209517
(cherry picked from commit 54381dd3763316ec02fe4c6ffb8bc64dc0de0276)
Reviewed-on: http://git-master/r/210241
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
drivers/usb/otg/tegra-otg.c

index b07b9a07041de0d635ec09b543b53e1d7753b3bd..4262654d05168d539c525fa6ac63613dae2e31e7 100644 (file)
@@ -96,10 +96,7 @@ static int otg_notifications(struct notifier_block *nb,
        DBG("%s(%d) tegra->int_status = 0x%lx\n", __func__,
                                __LINE__, tegra->int_status);
 
-       mutex_lock(&tegra->irq_work_mutex);
        schedule_work(&tegra->work);
-       mutex_unlock(&tegra->irq_work_mutex);
-
        DBG("%s(%d) End\n", __func__, __LINE__);
        return NOTIFY_DONE;
 }
@@ -635,6 +632,7 @@ static void tegra_otg_resume(struct device *dev)
 
        if (tegra->support_pmu_vbus) {
                mutex_unlock(&tegra->irq_work_mutex);
+               tegra->int_status = enable_interrupt(tegra, true);
                otg_notifications(NULL, 0, NULL);
                tegra->suspended = false;
                return ;