From 72919bd17c988e7044ea57ff5a1cdc9fff8f1259 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 27 Apr 2012 15:11:33 +1000 Subject: [PATCH] --- yaml --- r: 300009 b: refs/heads/master c: b99da31ed8521eb78d5d6930f3128f8ecdb75fae h: refs/heads/master i: 300007: ee59b0c6b1e57042fafc51b792dbc2823a71bb66 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv10_gpio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f843eac38df1..c258a3d87605 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffc6a4e49e5bc117aac13ed752cfc018c163e2ac +refs/heads/master: b99da31ed8521eb78d5d6930f3128f8ecdb75fae diff --git a/trunk/drivers/gpu/drm/nouveau/nv10_gpio.c b/trunk/drivers/gpu/drm/nouveau/nv10_gpio.c index 550ad3fcf0af..9d79180069df 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv10_gpio.c +++ b/trunk/drivers/gpu/drm/nouveau/nv10_gpio.c @@ -65,7 +65,7 @@ nv10_gpio_drive(struct drm_device *dev, int line, int dir, int out) if (line < 10) { line = (line - 2) * 4; reg = NV_PCRTC_GPIO_EXT; - mask = 0x00000003 << ((line - 2) * 4); + mask = 0x00000003; data = (dir << 1) | out; } else if (line < 14) {