diff options
Diffstat (limited to 'drivers/gpio/gpio-max730x.c')
-rw-r--r-- | drivers/gpio/gpio-max730x.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-max730x.c b/drivers/gpio/gpio-max730x.c index f4f4ed19bdc1..8672755f95c9 100644 --- a/drivers/gpio/gpio-max730x.c +++ b/drivers/gpio/gpio-max730x.c | |||
@@ -188,7 +188,7 @@ int __max730x_probe(struct max7301 *ts) | |||
188 | ts->chip.set = max7301_set; | 188 | ts->chip.set = max7301_set; |
189 | 189 | ||
190 | ts->chip.ngpio = PIN_NUMBER; | 190 | ts->chip.ngpio = PIN_NUMBER; |
191 | ts->chip.can_sleep = 1; | 191 | ts->chip.can_sleep = true; |
192 | ts->chip.dev = dev; | 192 | ts->chip.dev = dev; |
193 | ts->chip.owner = THIS_MODULE; | 193 | ts->chip.owner = THIS_MODULE; |
194 | 194 | ||
@@ -220,7 +220,6 @@ int __max730x_probe(struct max7301 *ts) | |||
220 | return ret; | 220 | return ret; |
221 | 221 | ||
222 | exit_destroy: | 222 | exit_destroy: |
223 | dev_set_drvdata(dev, NULL); | ||
224 | mutex_destroy(&ts->lock); | 223 | mutex_destroy(&ts->lock); |
225 | return ret; | 224 | return ret; |
226 | } | 225 | } |
@@ -234,8 +233,6 @@ int __max730x_remove(struct device *dev) | |||
234 | if (ts == NULL) | 233 | if (ts == NULL) |
235 | return -ENODEV; | 234 | return -ENODEV; |
236 | 235 | ||
237 | dev_set_drvdata(dev, NULL); | ||
238 | |||
239 | /* Power down the chip and disable IRQ output */ | 236 | /* Power down the chip and disable IRQ output */ |
240 | ts->write(dev, 0x04, 0x00); | 237 | ts->write(dev, 0x04, 0x00); |
241 | 238 | ||