From 8a4e51225259692c38e45679d07277dc57573b5f Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sat, 27 Oct 2012 16:03:00 +0100 Subject: [PATCH] --- yaml --- r: 337992 b: refs/heads/master c: 64ebe955f9447fcecf65360ec3bc332f4ec411b6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/iio/accel/hid-sensor-accel-3d.c | 6 +++--- trunk/drivers/iio/gyro/hid-sensor-gyro-3d.c | 6 +++--- trunk/drivers/iio/light/hid-sensor-als.c | 5 ++--- trunk/drivers/iio/magnetometer/hid-sensor-magn-3d.c | 6 +++--- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index b9be8db8e1ab..e579f261b2f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95273f8952a7e3a037e139eec0aa99872f086498 +refs/heads/master: 64ebe955f9447fcecf65360ec3bc332f4ec411b6 diff --git a/trunk/drivers/iio/accel/hid-sensor-accel-3d.c b/trunk/drivers/iio/accel/hid-sensor-accel-3d.c index a95cda0e387f..e67bb912bd19 100644 --- a/trunk/drivers/iio/accel/hid-sensor-accel-3d.c +++ b/trunk/drivers/iio/accel/hid-sensor-accel-3d.c @@ -306,10 +306,10 @@ static int __devinit hid_accel_3d_probe(struct platform_device *pdev) goto error_free_dev; } - channels = kmemdup(accel_3d_channels, - sizeof(accel_3d_channels), - GFP_KERNEL); + channels = kmemdup(accel_3d_channels, sizeof(accel_3d_channels), + GFP_KERNEL); if (!channels) { + ret = -ENOMEM; dev_err(&pdev->dev, "failed to duplicate channels\n"); goto error_free_dev; } diff --git a/trunk/drivers/iio/gyro/hid-sensor-gyro-3d.c b/trunk/drivers/iio/gyro/hid-sensor-gyro-3d.c index 02ef989b830d..4c8b158e40e1 100644 --- a/trunk/drivers/iio/gyro/hid-sensor-gyro-3d.c +++ b/trunk/drivers/iio/gyro/hid-sensor-gyro-3d.c @@ -306,10 +306,10 @@ static int __devinit hid_gyro_3d_probe(struct platform_device *pdev) goto error_free_dev; } - channels = kmemdup(gyro_3d_channels, - sizeof(gyro_3d_channels), - GFP_KERNEL); + channels = kmemdup(gyro_3d_channels, sizeof(gyro_3d_channels), + GFP_KERNEL); if (!channels) { + ret = -ENOMEM; dev_err(&pdev->dev, "failed to duplicate channels\n"); goto error_free_dev; } diff --git a/trunk/drivers/iio/light/hid-sensor-als.c b/trunk/drivers/iio/light/hid-sensor-als.c index 8e1f69844eea..23eeeef64e84 100644 --- a/trunk/drivers/iio/light/hid-sensor-als.c +++ b/trunk/drivers/iio/light/hid-sensor-als.c @@ -272,10 +272,9 @@ static int __devinit hid_als_probe(struct platform_device *pdev) goto error_free_dev; } - channels = kmemdup(als_channels, - sizeof(als_channels), - GFP_KERNEL); + channels = kmemdup(als_channels, sizeof(als_channels), GFP_KERNEL); if (!channels) { + ret = -ENOMEM; dev_err(&pdev->dev, "failed to duplicate channels\n"); goto error_free_dev; } diff --git a/trunk/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/trunk/drivers/iio/magnetometer/hid-sensor-magn-3d.c index d1b5fb74b9bf..8e75eb76ccd9 100644 --- a/trunk/drivers/iio/magnetometer/hid-sensor-magn-3d.c +++ b/trunk/drivers/iio/magnetometer/hid-sensor-magn-3d.c @@ -307,10 +307,10 @@ static int __devinit hid_magn_3d_probe(struct platform_device *pdev) goto error_free_dev; } - channels = kmemdup(magn_3d_channels, - sizeof(magn_3d_channels), - GFP_KERNEL); + channels = kmemdup(magn_3d_channels, sizeof(magn_3d_channels), + GFP_KERNEL); if (!channels) { + ret = -ENOMEM; dev_err(&pdev->dev, "failed to duplicate channels\n"); goto error_free_dev; }