Skip to content

Commit

Permalink
V4L/DVB (5953): msp3400-driver.c: kmalloc + memset conversion to kzalloc
Browse files Browse the repository at this point in the history 
Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Mariusz Kozlowski authored and Mauro Carvalho Chehab committed Oct 10, 2007
1 parent 3873dd0 commit b2a6576
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/media/video/msp3400-driver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -813,8 +813,9 @@ static int msp_attach(struct i2c_adapter *adapter, int address, int kind)
int msp_rom;

client = kzalloc(sizeof(*client), GFP_KERNEL);
if (client == NULL)
if (!client)
return -ENOMEM;

client->addr = address;
client->adapter = adapter;
client->driver = &i2c_driver;
Expand All @@ -826,14 +827,14 @@ static int msp_attach(struct i2c_adapter *adapter, int address, int kind)
return 0;
}

state = kmalloc(sizeof(*state), GFP_KERNEL);
if (state == NULL) {
state = kzalloc(sizeof(*state), GFP_KERNEL);
if (!state) {
kfree(client);
return -ENOMEM;
}

i2c_set_clientdata(client, state);

memset(state, 0, sizeof(*state));
state->v4l2_std = V4L2_STD_NTSC;
state->audmode = V4L2_TUNER_MODE_STEREO;
state->volume = 58880; /* 0db gain */
Expand Down

0 comments on commit b2a6576

Please sign in to comment.