diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-07 08:35:28 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-07 08:35:28 (GMT) |
| commit | 4b4b20852d1009c5e8bc357b22353b62e3a241c7 (patch) | |
| tree | 1026418471fe10c5b9f2fdff8a6b49bf070938fc /drivers/ata/ahci_seattle.c | |
| parent | 5130213721d01b6632c255d4295a8102cbb58379 (diff) | |
| parent | f00c0afdfa625165a609513bc74164d56752ec3e (diff) | |
| download | linux-4b4b20852d1009c5e8bc357b22353b62e3a241c7.tar.xz | |
Merge branch 'timers/fast-wheel' into timers/core
Diffstat (limited to 'drivers/ata/ahci_seattle.c')
| -rw-r--r-- | drivers/ata/ahci_seattle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/ahci_seattle.c b/drivers/ata/ahci_seattle.c index 6e702ab..1d31c0c 100644 --- a/drivers/ata/ahci_seattle.c +++ b/drivers/ata/ahci_seattle.c @@ -137,7 +137,7 @@ static const struct ata_port_info *ahci_seattle_get_port_info( u32 val; plat_data = devm_kzalloc(dev, sizeof(*plat_data), GFP_KERNEL); - if (IS_ERR(plat_data)) + if (!plat_data) return &ahci_port_info; plat_data->sgpio_ctrl = devm_ioremap_resource(dev, |