← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/staging/iio/imu/adis16400_ring.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
http://bugs.debian.org/627492
http://bugs.debian.org/596626
http://bugs.debian.org/628932
http://bugs.debian.org/628191
http://bugs.debian.org/627837
http://bugs.debian.org/622997
http://bugs.debian.org/622745
http://bugs.debian.org/619827
http://bugs.debian.org/629401
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/staging/iio/imu/adis16400_ring.c
122
122
                        .tx_buf = st->tx,
123
123
                        .bits_per_word = 8,
124
124
                        .len = 2,
125
 
                        .cs_change = 0,
126
125
                }, {
127
126
                        .rx_buf = rx,
128
127
                        .bits_per_word = 8,
129
128
                        .len = 24,
130
 
                        .cs_change = 1,
131
129
                },
132
130
        };
133
131
 
162
160
                               work_trigger_to_ring);
163
161
        struct iio_ring_buffer *ring = st->indio_dev->ring;
164
162
 
165
 
        int i = 0;
 
163
        int i = 0, j;
166
164
        s16 *data;
167
165
        size_t datasize = ring->access.get_bytes_per_datum(ring);
 
166
        unsigned long mask = ring->scan_mask;
168
167
 
169
168
        data = kmalloc(datasize , GFP_KERNEL);
170
169
        if (data == NULL) {
174
173
 
175
174
        if (ring->scan_count)
176
175
                if (adis16400_spi_read_burst(&st->indio_dev->dev, st->rx) >= 0)
177
 
                        for (; i < ring->scan_count; i++)
 
176
                        for (; i < ring->scan_count; i++) {
 
177
                                j = __ffs(mask);
 
178
                                mask &= ~(1 << j);
178
179
                                data[i] = be16_to_cpup(
179
 
                                        (__be16 *)&(st->rx[i*2]));
 
180
                                        (__be16 *)&(st->rx[j*2]));
 
181
                        }
180
182
 
181
183
        /* Guaranteed to be aligned with 8 byte boundary */
182
184
        if (ring->scan_timestamp)