diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-12-16 11:54:32 -0500 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-12-16 11:54:32 -0500 |
| commit | c4ffa146849099e9178d3fcfa48ba114d3d1e432 (patch) | |
| tree | 47121403e38aff376042f0f793c94c54ba935c06 /drivers/misc/apds9802als.c | |
| parent | 82cc2e4b513e23a03df78b7f32ef957ef8180405 (diff) | |
| parent | e4ea0c16a85d221ebcc3a21f32e321440459e0fc (diff) | |
Merge branch 'for-2.6.38/core' into for-next
Diffstat (limited to 'drivers/misc/apds9802als.c')
| -rw-r--r-- | drivers/misc/apds9802als.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/misc/apds9802als.c b/drivers/misc/apds9802als.c index 0ed09358027e..644d4cd071cc 100644 --- a/drivers/misc/apds9802als.c +++ b/drivers/misc/apds9802als.c | |||
| @@ -251,7 +251,6 @@ static int apds9802als_probe(struct i2c_client *client, | |||
| 251 | 251 | ||
| 252 | return res; | 252 | return res; |
| 253 | als_error1: | 253 | als_error1: |
| 254 | i2c_set_clientdata(client, NULL); | ||
| 255 | kfree(data); | 254 | kfree(data); |
| 256 | return res; | 255 | return res; |
| 257 | } | 256 | } |