Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 137935
b: refs/heads/master
c: 8420fa7
h: refs/heads/master
i:
  137933: 1077cb0
  137931: 773b17f
  137927: 6fadeae
  137919: 27ce389
v: v3
  • Loading branch information
Matthias Schwarzott authored and Mauro Carvalho Chehab committed Mar 30, 2009
1 parent a8f08ff commit 3758088
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 51ca3bddf34bb6cdbdddd89f59fe3a0131d40eba
refs/heads/master: 8420fa7ee22c1d681549ff7ab0466ceda5a911c2
2 changes: 1 addition & 1 deletion trunk/drivers/media/dvb/frontends/cx24113.c
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ struct dvb_frontend *cx24113_attach(struct dvb_frontend *fe,
kzalloc(sizeof(struct cx24113_state), GFP_KERNEL);
int rc;
if (state == NULL) {
err("Unable to kmalloc\n");
err("Unable to kzalloc\n");
goto error;
}

Expand Down
5 changes: 1 addition & 4 deletions trunk/drivers/media/dvb/frontends/cx24116.c
Original file line number Diff line number Diff line change
Expand Up @@ -1112,13 +1112,10 @@ struct dvb_frontend *cx24116_attach(const struct cx24116_config *config,
dprintk("%s\n", __func__);

/* allocate memory for the internal state */
state = kmalloc(sizeof(struct cx24116_state), GFP_KERNEL);
state = kzalloc(sizeof(struct cx24116_state), GFP_KERNEL);
if (state == NULL)
goto error1;

/* setup the state */
memset(state, 0, sizeof(struct cx24116_state));

state->config = config;
state->i2c = i2c;

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/media/dvb/frontends/cx24123.c
Original file line number Diff line number Diff line change
Expand Up @@ -1069,13 +1069,13 @@ static struct dvb_frontend_ops cx24123_ops;
struct dvb_frontend *cx24123_attach(const struct cx24123_config *config,
struct i2c_adapter *i2c)
{
/* allocate memory for the internal state */
struct cx24123_state *state =
kzalloc(sizeof(struct cx24123_state), GFP_KERNEL);

dprintk("\n");
/* allocate memory for the internal state */
if (state == NULL) {
err("Unable to kmalloc\n");
err("Unable to kzalloc\n");
goto error;
}

Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/media/dvb/frontends/lgdt3304.c
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,6 @@ struct dvb_frontend* lgdt3304_attach(const struct lgdt3304_config *config,

struct lgdt3304_state *state;
state = kzalloc(sizeof(struct lgdt3304_state), GFP_KERNEL);
memset(state, 0x0, sizeof(struct lgdt3304_state));
state->addr = config->i2c_address;
state->i2c = i2c;

Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/media/dvb/frontends/s921_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ struct dvb_frontend* s921_attach(const struct s921_config *config,

struct s921_state *state;
state = kzalloc(sizeof(struct s921_state), GFP_KERNEL);
memset(state, 0x0, sizeof(struct s921_state));

state->addr = config->i2c_address;
state->i2c = i2c;
Expand Down

0 comments on commit 3758088

Please sign in to comment.