Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 10636
b: refs/heads/master
c: 2286066
h: refs/heads/master
v: v3
  • Loading branch information
Deepak Saxena authored and Greg Kroah-Hartman committed Oct 28, 2005
1 parent a3f056c commit c88df9c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 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: 4d4e5ce8648561b964699afb2df5e7268a84599b
refs/heads/master: 2286066faf51890e49ad61e2ceab683666cd9108
3 changes: 1 addition & 2 deletions trunk/drivers/i2c/busses/i2c-ixp2000.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,10 @@ static int ixp2000_i2c_probe(struct device *dev)
struct platform_device *plat_dev = to_platform_device(dev);
struct ixp2000_i2c_pins *gpio = plat_dev->dev.platform_data;
struct ixp2000_i2c_data *drv_data =
kmalloc(sizeof(struct ixp2000_i2c_data), GFP_KERNEL);
kzalloc(sizeof(struct ixp2000_i2c_data), GFP_KERNEL);

if (!drv_data)
return -ENOMEM;
memzero(drv_data, sizeof(*drv_data));
drv_data->gpio_pins = gpio;

drv_data->algo_data.data = gpio;
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/i2c/busses/i2c-ixp4xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,11 @@ static int ixp4xx_i2c_probe(struct device *dev)
struct platform_device *plat_dev = to_platform_device(dev);
struct ixp4xx_i2c_pins *gpio = plat_dev->dev.platform_data;
struct ixp4xx_i2c_data *drv_data =
kmalloc(sizeof(struct ixp4xx_i2c_data), GFP_KERNEL);
kzalloc(sizeof(struct ixp4xx_i2c_data), GFP_KERNEL);

if(!drv_data)
return -ENOMEM;

memzero(drv_data, sizeof(struct ixp4xx_i2c_data));
drv_data->gpio_pins = gpio;

/*
Expand Down

0 comments on commit c88df9c

Please sign in to comment.