diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index fa189912158d..0ce985320e5d 100755
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -17,12 +17,13 @@ config KEYS_RK29
 	default y
 	help
 		rk29 keyboard drivers(gpio and adc)
+
 config SYNAPTICS_SO340010
 	tristate "Synaptics So340010 TouchPad KEY"
-	depends on ARCH_RK29
-	default y
+	depends on I2C
 	help
 	   "Synaptics So340010 Touch Key (I2C) driver"
+
 config KEYBOARD_AAED2000
 	tristate "AAED-2000 keyboard"
 	depends on MACH_AAED2000
diff --git a/drivers/misc/apanic.c b/drivers/misc/apanic.c
index 0eb7ed6be672..4a9f48ac7480 100644
--- a/drivers/misc/apanic.c
+++ b/drivers/misc/apanic.c
@@ -216,8 +216,8 @@ static void mtd_panic_erase(void)
 	struct apanic_data *ctx = &drv_ctx;
 #ifdef CONFIG_MTD_RKNAND
 	size_t wlen;
-	memset(ctx->bounce, 0, sizeof(struct panic_header));
-	ctx->mtd->write(ctx->mtd, 0, sizeof(struct panic_header), &wlen, ctx->bounce);
+	memset(ctx->bounce, 0, ctx->mtd->writesize);
+	ctx->mtd->write(ctx->mtd, 0, ctx->mtd->writesize, &wlen, ctx->bounce);
 #else
 	struct erase_info erase;
 	DECLARE_WAITQUEUE(wait, current);