From f01dc4c498f2b211aafd80b595c34727e02f1243 Mon Sep 17 00:00:00 2001 From: "jacmet@sunsite.dk" Date: Fri, 28 Sep 2007 16:21:14 +0200 Subject: [PATCH] --- yaml --- r: 65211 b: refs/heads/master c: 39db0fd9db6caea8887f61fee4a0e53c6f8fec5e h: refs/heads/master i: 65209: 10660ebfee99e55a3d00a875849a547b23dd3918 65207: 42422df2489075aad3ff4c4a328f55a0d2101577 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/83xx/usb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e2689c8b783c..257b65106166 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d214602804a85e5da68b745ae69d9beaa5bedc93 +refs/heads/master: 39db0fd9db6caea8887f61fee4a0e53c6f8fec5e diff --git a/trunk/arch/powerpc/platforms/83xx/usb.c b/trunk/arch/powerpc/platforms/83xx/usb.c index e7fdf013cd39..eafe7605cdac 100644 --- a/trunk/arch/powerpc/platforms/83xx/usb.c +++ b/trunk/arch/powerpc/platforms/83xx/usb.c @@ -76,14 +76,14 @@ int mpc834x_usb_cfg(void) if (port0_is_dr) printk(KERN_WARNING "834x USB port0 can't be used by both DR and MPH!\n"); - sicrl |= MPC834X_SICRL_USB0; + sicrl &= ~MPC834X_SICRL_USB0; } prop = of_get_property(np, "port1", NULL); if (prop) { if (port1_is_dr) printk(KERN_WARNING "834x USB port1 can't be used by both DR and MPH!\n"); - sicrl |= MPC834X_SICRL_USB1; + sicrl &= ~MPC834X_SICRL_USB1; } of_node_put(np); }