diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2013-10-25 11:03:48 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-10-25 11:03:48 +0200 |
| commit | 8df5a1ba67b1a4b1560472359c30a5b1e3ebcc78 (patch) | |
| tree | 1563cc6270c76867a8dfe60c7c3d1e57064fed79 /drivers/mfd/sm501.c | |
| parent | 46a99d03f97e54d346a35bb8f0fa79ba73687ad0 (diff) | |
| parent | 6bfd1e63de34a278d67db32e3644340838308252 (diff) | |
| download | lwn-8df5a1ba67b1a4b1560472359c30a5b1e3ebcc78.tar.gz lwn-8df5a1ba67b1a4b1560472359c30a5b1e3ebcc78.zip | |
Merge tag 'mfd-lee-3.13-1' of git://git.linaro.org/people/ljones/mfd
mfd-lee-3.13-1
MFD patches due for v3.13.
Diffstat (limited to 'drivers/mfd/sm501.c')
| -rw-r--r-- | drivers/mfd/sm501.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c index 33f040c558d0..c2c8c91c6c7b 100644 --- a/drivers/mfd/sm501.c +++ b/drivers/mfd/sm501.c @@ -1232,7 +1232,7 @@ static ssize_t sm501_dbg_regs(struct device *dev, } -static DEVICE_ATTR(dbg_regs, 0666, sm501_dbg_regs, NULL); +static DEVICE_ATTR(dbg_regs, 0444, sm501_dbg_regs, NULL); /* sm501_init_reg * @@ -1660,7 +1660,6 @@ static int sm501_pci_probe(struct pci_dev *dev, err3: pci_disable_device(dev); err2: - pci_set_drvdata(dev, NULL); kfree(sm); err1: return err; @@ -1695,7 +1694,6 @@ static void sm501_pci_remove(struct pci_dev *dev) release_resource(sm->regs_claim); kfree(sm->regs_claim); - pci_set_drvdata(dev, NULL); pci_disable_device(dev); } |