diff --git a/[refs] b/[refs] index aaf5da5b41c4..d5ffe6bd188c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1334fb3c3006ba109886158c0ad79512f928bc1 +refs/heads/master: f4ebcab36088d45a5e8889e9b63d77e01c808076 diff --git a/trunk/drivers/gpio/stmpe-gpio.c b/trunk/drivers/gpio/stmpe-gpio.c index 65b996083918..932759db1ac2 100644 --- a/trunk/drivers/gpio/stmpe-gpio.c +++ b/trunk/drivers/gpio/stmpe-gpio.c @@ -291,8 +291,6 @@ static int __devinit stmpe_gpio_probe(struct platform_device *pdev) int irq; pdata = stmpe->pdata->gpio; - if (!pdata) - return -ENODEV; irq = platform_get_irq(pdev, 0); if (irq < 0)