diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 56efc99..6c09eac 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -388,6 +388,7 @@ config TOUCHSCREEN_PENMOUNT
 
 config TOUCHSCREEN_EDT_FT5X06
 	tristate "EDT FocalTech FT5x06 I2C Touchscreen support"
+	depends on I2C
 	help
 	  Say Y here if you have an EDT "Polytouch" touchscreen based
 	  on the FocalTech FT5x06 family of controllers connected to
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index eb31025..719e8e6 100644
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -544,12 +544,11 @@ static int edt_ft5x06_i2c_ts_probe(struct i2c_client *client,
 	mutex_init(&tsdata->mutex);
 
 	if (tsdata->reset_pin >= 0) {
-		error = gpio_request(tsdata->reset_pin, NULL);
+		error = gpio_request(tsdata->reset_pin, "edt-ft5x06 reset");
 		if (error < 0) {
 			dev_err(&client->dev,
 			        "Failed to request GPIO %d as reset pin, error %d\n",
 			         tsdata->reset_pin, error);
-			error = -ENOMEM;
 			goto err_free_tsdata;
 		}
 
@@ -564,7 +563,7 @@ static int edt_ft5x06_i2c_ts_probe(struct i2c_client *client,
 	tsdata->irq_pin = pdata->irq_pin;
 	tsdata->irq = gpio_to_irq(tsdata->irq_pin);
 
-	error = gpio_request(tsdata->irq_pin, NULL);
+	error = gpio_request(tsdata->irq_pin, "edt-ft5x06 irq");
 	if (error < 0) {
 		dev_err(&client->dev,
 		        "Failed to request GPIO %d for IRQ %d, error %d\n",