diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-14 18:51:33 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-14 18:51:33 +0300 |
| commit | 85a3685852d9ac7d92be9d824533c915a4597fa4 (patch) | |
| tree | b7c542e2061cf96c9f7ad500fa12567f9ff0b39f /drivers/ata/pata_cs5530.c | |
| parent | 92bac83dd79e60e65c475222e41a992a70434beb (diff) | |
| parent | 8b8a518ef16be2de27207991e32fc32b0475c767 (diff) | |
| download | linux-85a3685852d9ac7d92be9d824533c915a4597fa4.tar.xz | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.1 merge window.
Diffstat (limited to 'drivers/ata/pata_cs5530.c')
| -rw-r--r-- | drivers/ata/pata_cs5530.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c index 48ae4b434474..f9ca72e937ee 100644 --- a/drivers/ata/pata_cs5530.c +++ b/drivers/ata/pata_cs5530.c @@ -276,10 +276,8 @@ static int cs5530_init_chip(void) pci_dev_put(cs5530_0); return 0; fail_put: - if (master_0) - pci_dev_put(master_0); - if (cs5530_0) - pci_dev_put(cs5530_0); + pci_dev_put(master_0); + pci_dev_put(cs5530_0); return -ENODEV; } |