From 6d6e7b06e0ed231e01e4716d3ee010be740606c5 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 11 Sep 2012 22:19:47 -0700 Subject: [PATCH] --- yaml --- r: 328461 b: refs/heads/master c: 3c0528810c18213a4d820da74557ba89339cb6ed h: refs/heads/master i: 328459: 26817ac8af32c3a08bfb968d544b06b64f625459 v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpio-pcf857x.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 506d933f4408..4792a956f455 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20bc4d5d565159eb2b942bf4b7fae86fba94e32c +refs/heads/master: 3c0528810c18213a4d820da74557ba89339cb6ed diff --git a/trunk/drivers/gpio/gpio-pcf857x.c b/trunk/drivers/gpio/gpio-pcf857x.c index 12e3e484d70b..16af35cd2b10 100644 --- a/trunk/drivers/gpio/gpio-pcf857x.c +++ b/trunk/drivers/gpio/gpio-pcf857x.c @@ -285,7 +285,7 @@ static int pcf857x_probe(struct i2c_client *client, gpio->chip.ngpio = id->driver_data; /* enable gpio_to_irq() if platform has settings */ - if (pdata->irq) { + if (pdata && pdata->irq) { status = pcf857x_irq_domain_init(gpio, pdata, &client->dev); if (status < 0) { dev_err(&client->dev, "irq_domain init failed\n"); @@ -394,7 +394,7 @@ static int pcf857x_probe(struct i2c_client *client, dev_dbg(&client->dev, "probe error %d for '%s'\n", status, client->name); - if (pdata->irq) + if (pdata && pdata->irq) pcf857x_irq_domain_cleanup(gpio); kfree(gpio); @@ -418,7 +418,7 @@ static int pcf857x_remove(struct i2c_client *client) } } - if (pdata->irq) + if (pdata && pdata->irq) pcf857x_irq_domain_cleanup(gpio); status = gpiochip_remove(&gpio->chip);