diff options
author | Axel Lin <axel.lin@ingics.com> | 2012-10-27 11:03:00 -0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2012-11-17 05:17:28 -0500 |
commit | 64ebe955f9447fcecf65360ec3bc332f4ec411b6 (patch) | |
tree | 73ef17a2dd1c4f6958facd12b2516c55342f454a /drivers/iio | |
parent | 95273f8952a7e3a037e139eec0aa99872f086498 (diff) |
iio: hid-sensor: Return proper error if kmemdup fails
Return -ENOMEM instead of 0 if kmemdup fails.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r-- | drivers/iio/accel/hid-sensor-accel-3d.c | 6 | ||||
-rw-r--r-- | drivers/iio/gyro/hid-sensor-gyro-3d.c | 6 | ||||
-rw-r--r-- | drivers/iio/light/hid-sensor-als.c | 5 | ||||
-rw-r--r-- | drivers/iio/magnetometer/hid-sensor-magn-3d.c | 6 |
4 files changed, 11 insertions, 12 deletions
diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c index a95cda0e387f..e67bb912bd19 100644 --- a/drivers/iio/accel/hid-sensor-accel-3d.c +++ b/drivers/iio/accel/hid-sensor-accel-3d.c | |||
@@ -306,10 +306,10 @@ static int __devinit hid_accel_3d_probe(struct platform_device *pdev) | |||
306 | goto error_free_dev; | 306 | goto error_free_dev; |
307 | } | 307 | } |
308 | 308 | ||
309 | channels = kmemdup(accel_3d_channels, | 309 | channels = kmemdup(accel_3d_channels, sizeof(accel_3d_channels), |
310 | sizeof(accel_3d_channels), | 310 | GFP_KERNEL); |
311 | GFP_KERNEL); | ||
312 | if (!channels) { | 311 | if (!channels) { |
312 | ret = -ENOMEM; | ||
313 | dev_err(&pdev->dev, "failed to duplicate channels\n"); | 313 | dev_err(&pdev->dev, "failed to duplicate channels\n"); |
314 | goto error_free_dev; | 314 | goto error_free_dev; |
315 | } | 315 | } |
diff --git a/drivers/iio/gyro/hid-sensor-gyro-3d.c b/drivers/iio/gyro/hid-sensor-gyro-3d.c index 02ef989b830d..4c8b158e40e1 100644 --- a/drivers/iio/gyro/hid-sensor-gyro-3d.c +++ b/drivers/iio/gyro/hid-sensor-gyro-3d.c | |||
@@ -306,10 +306,10 @@ static int __devinit hid_gyro_3d_probe(struct platform_device *pdev) | |||
306 | goto error_free_dev; | 306 | goto error_free_dev; |
307 | } | 307 | } |
308 | 308 | ||
309 | channels = kmemdup(gyro_3d_channels, | 309 | channels = kmemdup(gyro_3d_channels, sizeof(gyro_3d_channels), |
310 | sizeof(gyro_3d_channels), | 310 | GFP_KERNEL); |
311 | GFP_KERNEL); | ||
312 | if (!channels) { | 311 | if (!channels) { |
312 | ret = -ENOMEM; | ||
313 | dev_err(&pdev->dev, "failed to duplicate channels\n"); | 313 | dev_err(&pdev->dev, "failed to duplicate channels\n"); |
314 | goto error_free_dev; | 314 | goto error_free_dev; |
315 | } | 315 | } |
diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c index 8e1f69844eea..23eeeef64e84 100644 --- a/drivers/iio/light/hid-sensor-als.c +++ b/drivers/iio/light/hid-sensor-als.c | |||
@@ -272,10 +272,9 @@ static int __devinit hid_als_probe(struct platform_device *pdev) | |||
272 | goto error_free_dev; | 272 | goto error_free_dev; |
273 | } | 273 | } |
274 | 274 | ||
275 | channels = kmemdup(als_channels, | 275 | channels = kmemdup(als_channels, sizeof(als_channels), GFP_KERNEL); |
276 | sizeof(als_channels), | ||
277 | GFP_KERNEL); | ||
278 | if (!channels) { | 276 | if (!channels) { |
277 | ret = -ENOMEM; | ||
279 | dev_err(&pdev->dev, "failed to duplicate channels\n"); | 278 | dev_err(&pdev->dev, "failed to duplicate channels\n"); |
280 | goto error_free_dev; | 279 | goto error_free_dev; |
281 | } | 280 | } |
diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c index d1b5fb74b9bf..8e75eb76ccd9 100644 --- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c +++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c | |||
@@ -307,10 +307,10 @@ static int __devinit hid_magn_3d_probe(struct platform_device *pdev) | |||
307 | goto error_free_dev; | 307 | goto error_free_dev; |
308 | } | 308 | } |
309 | 309 | ||
310 | channels = kmemdup(magn_3d_channels, | 310 | channels = kmemdup(magn_3d_channels, sizeof(magn_3d_channels), |
311 | sizeof(magn_3d_channels), | 311 | GFP_KERNEL); |
312 | GFP_KERNEL); | ||
313 | if (!channels) { | 312 | if (!channels) { |
313 | ret = -ENOMEM; | ||
314 | dev_err(&pdev->dev, "failed to duplicate channels\n"); | 314 | dev_err(&pdev->dev, "failed to duplicate channels\n"); |
315 | goto error_free_dev; | 315 | goto error_free_dev; |
316 | } | 316 | } |