On Tue, Dec 19, 2006 at 05:56:01PM +0900, Akinobu Mita wrote:
> This patch checks return values:
>
> - irlmp_register_client()
> - irlmp_register_service()
> - irlan_open()
>
> Cc: Samuel Ortiz <[EMAIL PROTECTED]>
> Signed-off-by: Akinobu Mita <[EMAIL PROTECTED]>
This one seems correct as well, thanks again.
Signed-off-by: Samuel Ortiz <[EMAIL PROTECTED]>
Cheers,
Samuel.
>
> ---
> net/irda/irlan/irlan_common.c | 23 ++++++++++++++++++++---
> 1 file changed, 20 insertions(+), 3 deletions(-)
>
> Index: 2.6-mm/net/irda/irlan/irlan_common.c
> ===================================================================
> --- 2.6-mm.orig/net/irda/irlan/irlan_common.c
> +++ 2.6-mm/net/irda/irlan/irlan_common.c
> @@ -144,12 +144,18 @@ static int __init irlan_init(void)
> /* Register with IrLMP as a client */
> ckey = irlmp_register_client(hints, &irlan_client_discovery_indication,
> NULL, NULL);
> -
> + if (!ckey)
> + goto err_ckey;
> +
> /* Register with IrLMP as a service */
> - skey = irlmp_register_service(hints);
> + skey = irlmp_register_service(hints);
> + if (!skey)
> + goto err_skey;
>
> /* Start the master IrLAN instance (the only one for now) */
> - new = irlan_open(DEV_ADDR_ANY, DEV_ADDR_ANY);
> + new = irlan_open(DEV_ADDR_ANY, DEV_ADDR_ANY);
> + if (!new)
> + goto err_open;
>
> /* The master will only open its (listen) control TSAP */
> irlan_provider_open_ctrl_tsap(new);
> @@ -158,6 +164,17 @@ static int __init irlan_init(void)
> irlmp_discovery_request(DISCOVERY_DEFAULT_SLOTS);
>
> return 0;
> +
> +err_open:
> + irlmp_unregister_service(skey);
> +err_skey:
> + irlmp_unregister_client(ckey);
> +err_ckey:
> +#ifdef CONFIG_PROC_FS
> + remove_proc_entry("irlan", proc_irda);
> +#endif /* CONFIG_PROC_FS */
> +
> + return -ENOMEM;
> }
>
> static void __exit irlan_cleanup(void)
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
