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_qdi.c | |
| parent | 3be11c8f4f2fa194834c2e83540f34da442b8977 (diff) | |
| parent | f238085415c56618e042252894f2fcc971add645 (diff) | |
merge linus into test branch
Diffstat (limited to 'drivers/ata/pata_qdi.c')
| -rw-r--r-- | drivers/ata/pata_qdi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c index 36f621abc390..afc0d990e7d6 100644 --- a/drivers/ata/pata_qdi.c +++ b/drivers/ata/pata_qdi.c | |||
| @@ -247,8 +247,8 @@ static __init int qdi_init_one(unsigned long port, int type, unsigned long io, i | |||
| 247 | */ | 247 | */ |
| 248 | 248 | ||
| 249 | pdev = platform_device_register_simple(DRV_NAME, nr_qdi_host, NULL, 0); | 249 | pdev = platform_device_register_simple(DRV_NAME, nr_qdi_host, NULL, 0); |
| 250 | if (pdev == NULL) | 250 | if (IS_ERR(pdev)) |
| 251 | return -ENOMEM; | 251 | return PTR_ERR(pdev); |
| 252 | 252 | ||
| 253 | memset(&ae, 0, sizeof(struct ata_probe_ent)); | 253 | memset(&ae, 0, sizeof(struct ata_probe_ent)); |
| 254 | INIT_LIST_HEAD(&ae.node); | 254 | INIT_LIST_HEAD(&ae.node); |