Skip to content

Commit

Permalink
[PATCH] ata: fix platform_device_register_simple() error check
Browse files Browse the repository at this point in the history
The return value of platform_device_register_simple() should be checked
by IS_ERR().

Cc: Jeff Garzik <jgarzik@pobox.com>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Akinobu Mita authored and Jeff Garzik committed Dec 16, 2006
1 parent 551c012 commit 9825d73
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion drivers/ata/pata_legacy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions drivers/ata/pata_qdi.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ static __init int qdi_init_one(unsigned long port, int type, unsigned long io, i
*/

pdev = platform_device_register_simple(DRV_NAME, nr_qdi_host, NULL, 0);
if (pdev == NULL)
return -ENOMEM;
if (IS_ERR(pdev))
return PTR_ERR(pdev);

memset(&ae, 0, sizeof(struct ata_probe_ent));
INIT_LIST_HEAD(&ae.node);
Expand Down
4 changes: 2 additions & 2 deletions drivers/ata/pata_winbond.c
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ static __init int winbond_init_one(unsigned long port)
*/

pdev = platform_device_register_simple(DRV_NAME, nr_winbond_host, NULL, 0);
if (pdev == NULL)
return -ENOMEM;
if (IS_ERR(pdev))
return PTR_ERR(pdev);

memset(&ae, 0, sizeof(struct ata_probe_ent));
INIT_LIST_HEAD(&ae.node);
Expand Down

0 comments on commit 9825d73

Please sign in to comment.