Title: [9315] trunk/drivers/staging/iio/magnetometer/hmc5843.c: merge from upstream: Staging: iio: signedness bug
- Revision
- 9315
- Author
- vapier
- Date
- 2010-10-24 16:36:24 -0400 (Sun, 24 Oct 2010)
Log Message
merge from upstream: Staging: iio: signedness bug
From: Dan Carpenter <[email protected]>
i2c_smbus_read_byte_data() returns an s32 type. We need to change
"rate" to signed for the error handling to work.
Also I changed it to propogate the error code instead of just returning
-EINVAL. Other error codes could be -EAGAIN for example.
Signed-off-by: Dan Carpenter <[email protected]>
Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Modified Paths
Diff
Modified: trunk/drivers/staging/iio/magnetometer/hmc5843.c (9314 => 9315)
--- trunk/drivers/staging/iio/magnetometer/hmc5843.c 2010-10-24 20:23:49 UTC (rev 9314)
+++ trunk/drivers/staging/iio/magnetometer/hmc5843.c 2010-10-24 20:36:24 UTC (rev 9315)
@@ -389,11 +389,11 @@
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct i2c_client *client = to_i2c_client(indio_dev->dev.parent);
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
- u32 rate;
+ s32 rate;
rate = i2c_smbus_read_byte_data(client, this_attr->address);
if (rate < 0)
- return -EINVAL;
+ return rate;
rate = (rate & RATE_BITMASK) >> RATE_OFFSET;
return sprintf(buf, "%s\n", regval_to_samp_freq[rate]);
}
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
