diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-18 23:37:37 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-18 23:37:37 +0200 |
commit | af15c1addf920d830b030e3489a482456904ca8c (patch) | |
tree | dc4adab63d19507f7ac44855ad9920f8fd2dd2f0 /arch/arm/mach-mx3/mx31moboard.c | |
parent | e6f25a7b2398581a5f96bf9021d0b22c9647acf4 (diff) | |
parent | dcd94dbdaff452b95d4ba11fdbf853b5bda8e6e7 (diff) | |
download | linux-next-af15c1addf920d830b030e3489a482456904ca8c.tar.gz |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/arm/mach-mx3/mx31moboard.c')
-rw-r--r-- | arch/arm/mach-mx3/mx31moboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard.c b/arch/arm/mach-mx3/mx31moboard.c index a17f2e411609..2a2da4739ecf 100644 --- a/arch/arm/mach-mx3/mx31moboard.c +++ b/arch/arm/mach-mx3/mx31moboard.c @@ -94,7 +94,7 @@ static struct imxi2c_platform_data moboard_i2c1_pdata = { static int moboard_sdhc1_get_ro(struct device *dev) { - return gpio_get_value(SDHC1_WP); + return !gpio_get_value(SDHC1_WP); } static int moboard_sdhc1_init(struct device *dev, irq_handler_t detect_irq, |