]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
drm/radeon/kms: fix regression in rs4xx i2c setup
authorAlex Deucher <alexdeucher@gmail.com>
Sun, 21 Nov 2010 15:58:05 +0000 (10:58 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 9 Dec 2010 21:32:56 +0000 (13:32 -0800)
commit 791cfe2684a74ed7155254816ff9e89e6064277c upstream.

typo in my last i2c rework.

Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=23222

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/gpu/drm/radeon/radeon_combios.c

index 3bddea5b52956fbd9881193bac47827a7024ebe4..137b8075f6e7c434fc02b5e328c19d06127f8e05 100644 (file)
@@ -729,7 +729,7 @@ void radeon_combios_i2c_init(struct radeon_device *rdev)
                                        clk = RBIOS8(offset + 3 + (i * 5) + 3);
                                        data = RBIOS8(offset + 3 + (i * 5) + 4);
                                        i2c = combios_setup_i2c_bus(rdev, DDC_MONID,
-                                                                   clk, data);
+                                                                   (1 << clk), (1 << data));
                                        rdev->i2c_bus[4] = radeon_i2c_create(dev, &i2c, "GPIOPAD_MASK");
                                        break;
                                }