diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-20 02:53:13 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-20 02:53:13 -0500 |
| commit | 9774f3384125912eb491ca77f77907324db3ed05 (patch) | |
| tree | 0bdc7486e911dd9e955b41283ee19ac74521f7bd /drivers/ata/pata_legacy.c | |
| parent | 3be11c8f4f2fa194834c2e83540f34da442b8977 (diff) | |
| parent | f238085415c56618e042252894f2fcc971add645 (diff) | |
merge linus into test branch
Diffstat (limited to 'drivers/ata/pata_legacy.c')
| -rw-r--r-- | drivers/ata/pata_legacy.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c index c7d1738e4e69..e7bf9d89c8ee 100644 --- a/drivers/ata/pata_legacy.c +++ b/drivers/ata/pata_legacy.c @@ -698,8 +698,10 @@ static __init int legacy_init_one(int port, unsigned long io, unsigned long ctrl goto fail_io; pdev = platform_device_register_simple(DRV_NAME, nr_legacy_host, NULL, 0); - if (pdev == NULL) + if (IS_ERR(pdev)) { + ret = PTR_ERR(pdev); goto fail_dev; + } if (ht6560a & mask) { ops = &ht6560a_port_ops; |