summaryrefslogtreecommitdiff
path: root/drivers/gpib/fmh_gpib/fmh_gpib.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpib/fmh_gpib/fmh_gpib.c')
-rw-r--r--drivers/gpib/fmh_gpib/fmh_gpib.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpib/fmh_gpib/fmh_gpib.c b/drivers/gpib/fmh_gpib/fmh_gpib.c
index f7bfb4a8e553..d82ec06b3085 100644
--- a/drivers/gpib/fmh_gpib/fmh_gpib.c
+++ b/drivers/gpib/fmh_gpib/fmh_gpib.c
@@ -1250,11 +1250,10 @@ static int fmh_gpib_allocate_private(struct gpib_board *board)
{
struct fmh_priv *priv;
- board->private_data = kmalloc(sizeof(struct fmh_priv), GFP_KERNEL);
+ board->private_data = kzalloc(sizeof(struct fmh_priv), GFP_KERNEL);
if (!board->private_data)
return -ENOMEM;
priv = board->private_data;
- memset(priv, 0, sizeof(struct fmh_priv));
init_nec7210_private(&priv->nec7210_priv);
priv->dma_buffer_size = 0x800;
priv->dma_buffer = kmalloc(priv->dma_buffer_size, GFP_KERNEL);
@@ -1286,7 +1285,7 @@ static int fmh_gpib_generic_attach(struct gpib_board *board)
board->status = 0;
retval = fmh_gpib_allocate_private(board);
- if (retval < 0)
+ if (retval)
return retval;
e_priv = board->private_data;
nec_priv = &e_priv->nec7210_priv;