tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

iio: magnetometer: ak8975: Fix reading for ak099xx sensors

Move ST2 reading with overflow handling after measurement data
reading.
ST2 register read have to be read after read measurment data,
because it means end of the reading and realease the lock on the data.
Remove ST2 read skip on interrupt based waiting because ST2 required to
be read out at and of the axis read.

Fixes: 57e73a423b1e ("iio: ak8975: add ak09911 and ak09912 support")
Signed-off-by: Barnabás Czémán <barnabas.czeman@mainlining.org>
Link: https://patch.msgid.link/20240819-ak09918-v4-2-f0734d14cfb9@mainlining.org
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Barnabás Czémán and committed by
Jonathan Cameron 129464e8 3b92fc43

+16 -16
+16 -16
drivers/iio/magnetometer/ak8975.c
··· 696 696 if (ret < 0) 697 697 return ret; 698 698 699 - /* This will be executed only for non-interrupt based waiting case */ 700 - if (ret & data->def->ctrl_masks[ST1_DRDY]) { 701 - ret = i2c_smbus_read_byte_data(client, 702 - data->def->ctrl_regs[ST2]); 703 - if (ret < 0) { 704 - dev_err(&client->dev, "Error in reading ST2\n"); 705 - return ret; 706 - } 707 - if (ret & (data->def->ctrl_masks[ST2_DERR] | 708 - data->def->ctrl_masks[ST2_HOFL])) { 709 - dev_err(&client->dev, "ST2 status error 0x%x\n", ret); 710 - return -EINVAL; 711 - } 712 - } 713 - 714 - return 0; 699 + /* Return with zero if the data is ready. */ 700 + return !data->def->ctrl_regs[ST1_DRDY]; 715 701 } 716 702 717 703 /* Retrieve raw flux value for one of the x, y, or z axis. */ ··· 723 737 sizeof(rval), (u8*)&rval); 724 738 if (ret < 0) 725 739 goto exit; 740 + 741 + /* Read out ST2 for release lock on measurment data. */ 742 + ret = i2c_smbus_read_byte_data(client, data->def->ctrl_regs[ST2]); 743 + if (ret < 0) { 744 + dev_err(&client->dev, "Error in reading ST2\n"); 745 + goto exit; 746 + } 747 + 748 + if (ret & (data->def->ctrl_masks[ST2_DERR] | 749 + data->def->ctrl_masks[ST2_HOFL])) { 750 + dev_err(&client->dev, "ST2 status error 0x%x\n", ret); 751 + ret = -EINVAL; 752 + goto exit; 753 + } 726 754 727 755 mutex_unlock(&data->lock); 728 756