diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:12:17 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:12:17 +0100 |
| commit | d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902 (patch) | |
| tree | 4fe17a547c8c4e403c18cdc6a6c5e30c6f437bc9 /drivers/hwmon/da9055-hwmon.c | |
| parent | ALSA: hda - Avoid codec D3 for keeping mute LED up on Lenovo Yxx0 (diff) | |
| parent | ALSA: hda - Add a fixup for HP Folio 13 mute LED (diff) | |
| download | linux-d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902.tar.xz linux-d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902.zip | |
Merge branch 'for-linus' into HEAD
Diffstat (limited to 'drivers/hwmon/da9055-hwmon.c')
| -rw-r--r-- | drivers/hwmon/da9055-hwmon.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/hwmon/da9055-hwmon.c b/drivers/hwmon/da9055-hwmon.c index 029ecabc4380..73b3865f1207 100644 --- a/drivers/hwmon/da9055-hwmon.c +++ b/drivers/hwmon/da9055-hwmon.c @@ -278,10 +278,6 @@ static int da9055_hwmon_probe(struct platform_device *pdev) if (hwmon_irq < 0) return hwmon_irq; - hwmon_irq = regmap_irq_get_virq(hwmon->da9055->irq_data, hwmon_irq); - if (hwmon_irq < 0) - return hwmon_irq; - ret = devm_request_threaded_irq(&pdev->dev, hwmon_irq, NULL, da9055_auxadc_irq, IRQF_TRIGGER_HIGH | IRQF_ONESHOT, |