diff options
| author |   Rupesh Gujare <rupesh.gujare@atmel.com> | 2013-07-24 15:06:46 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-25 13:40:53 -0700 |
| commit | 8079154a1d7c724569d5e3cd2af147a8eb3867c3 (patch) | |
| tree | 9e7f91af0a00b836d99e19885b448833c79964d4 /drivers/staging/ozwpan | |
| parent | staging: vt6656: remove dead code DBG_PORT80/VIAWET_DEBUG (diff) | |
| download | linux-dev-8079154a1d7c724569d5e3cd2af147a8eb3867c3.tar.xz linux-dev-8079154a1d7c724569d5e3cd2af147a8eb3867c3.zip | |
staging: ozwpan: Fix coding style.
This patch fixes coding style issues reported by Dan here:-
http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/2012-June/027767.html
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Rupesh Gujare <rupesh.gujare@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ozwpan')
| -rw-r--r-- | drivers/staging/ozwpan/ozcdev.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/staging/ozwpan/ozcdev.c b/drivers/staging/ozwpan/ozcdev.c index 3e29760ba77e..73b582cdf424 100644 --- a/drivers/staging/ozwpan/ozcdev.c +++ b/drivers/staging/ozwpan/ozcdev.c @@ -333,10 +333,11 @@ int oz_cdev_register(void) { int err; struct device *dev; + memset(&g_cdev, 0, sizeof(g_cdev)); err = alloc_chrdev_region(&g_cdev.devnum, 0, 1, "ozwpan"); if (err < 0) - goto out3; + return err; oz_dbg(ON, "Alloc dev number %d:%d\n", MAJOR(g_cdev.devnum), MINOR(g_cdev.devnum)); cdev_init(&g_cdev.cdev, &oz_fops); @@ -347,26 +348,26 @@ int oz_cdev_register(void) err = cdev_add(&g_cdev.cdev, g_cdev.devnum, 1); if (err < 0) { oz_dbg(ON, "Failed to add cdev\n"); - goto out2; + goto unregister; } g_oz_class = class_create(THIS_MODULE, "ozmo_wpan"); if (IS_ERR(g_oz_class)) { oz_dbg(ON, "Failed to register ozmo_wpan class\n"); err = PTR_ERR(g_oz_class); - goto out1; + goto delete; } dev = device_create(g_oz_class, NULL, g_cdev.devnum, NULL, "ozwpan"); if (IS_ERR(dev)) { oz_dbg(ON, "Failed to create sysfs entry for cdev\n"); err = PTR_ERR(dev); - goto out1; + goto delete; } return 0; -out1: + +delete: cdev_del(&g_cdev.cdev); -out2: +unregister: unregister_chrdev_region(g_cdev.devnum, 1); -out3: return err; } /*------------------------------------------------------------------------------ |