From: Ben Skeggs Date: Tue, 18 Mar 2014 14:35:44 +0000 (+1000) Subject: drm/nv50/gpio: exclude sense value from mask when changing registers X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5cfd48b21274c0dc2ec30e7997745833e6be71ad;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git drm/nv50/gpio: exclude sense value from mask when changing registers Shouldn't effect anything, was just momentarily confusing while looking at traces. Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/core/subdev/gpio/nv50.c b/drivers/gpu/drm/nouveau/core/subdev/gpio/nv50.c index c4c1d415e7fe..904b67fe1e14 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/gpio/nv50.c +++ b/drivers/gpu/drm/nouveau/core/subdev/gpio/nv50.c @@ -79,7 +79,7 @@ nv50_gpio_drive(struct nouveau_gpio *gpio, int line, int dir, int out) if (nv50_gpio_location(line, ®, &shift)) return -EINVAL; - nv_mask(gpio, reg, 7 << shift, (((dir ^ 1) << 1) | out) << shift); + nv_mask(gpio, reg, 3 << shift, (((dir ^ 1) << 1) | out) << shift); return 0; }