From 991ee1ab4022a70f518c9ca9c41fc031babe3019 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Tue, 10 Aug 2010 07:37:33 +0200
Subject: [PATCH] --- yaml --- r: 219647 b: refs/heads/master c:
 213fd2270450f7b5f98803e58bc25063c249e032 h: refs/heads/master i:   219645:
 648ec580a68904babe774df001f65b6f1e87e46c   219643:
 7276bde69d10fc5ca3ab888e964223091b2873cb   219639:
 eddacc8e25593d5fa4621a427b40f58788c91a5b   219631:
 0a767f667b91c8383fcaea014af326c3b08013e9   219615:
 f0935e0b4e2a3997cf76d1b567e8fe2bc3829249   219583:
 b649f8b5676201bb347b478a2ef2791ccaf0937a   219519:
 6812e63ff1de85d83412aaf482080d4736bf95b4   219391:
 59cb30bc0847335ee0e5a1560f246a4e4fa68446   219135:
 0eda1b00caf478aa3cb52937339783f06171e750 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/staging/iio/magnetometer/hmc5843.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dc2c96467119..0918a43c3468 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1ae4da731a6e049a675097ebfd9a02b9b50530e
+refs/heads/master: 213fd2270450f7b5f98803e58bc25063c249e032
diff --git a/trunk/drivers/staging/iio/magnetometer/hmc5843.c b/trunk/drivers/staging/iio/magnetometer/hmc5843.c
index ea5f749c5fe7..2b1828017076 100644
--- a/trunk/drivers/staging/iio/magnetometer/hmc5843.c
+++ b/trunk/drivers/staging/iio/magnetometer/hmc5843.c
@@ -389,11 +389,11 @@ static ssize_t show_sampling_frequency(struct device *dev,
 	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]);
 }