← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/mtd/onenand/onenand_base.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/mtd/onenand/onenand_base.c
1132
1132
                        onenand_update_bufferram(mtd, from, !ret);
1133
1133
                        if (ret == -EBADMSG)
1134
1134
                                ret = 0;
 
1135
                        if (ret)
 
1136
                                break;
1135
1137
                }
1136
1138
 
1137
1139
                this->read_bufferram(mtd, ONENAND_DATARAM, buf, column, thislen);
1646
1648
        int ret = 0;
1647
1649
        int thislen, column;
1648
1650
 
 
1651
        column = addr & (this->writesize - 1);
 
1652
 
1649
1653
        while (len != 0) {
1650
 
                thislen = min_t(int, this->writesize, len);
1651
 
                column = addr & (this->writesize - 1);
1652
 
                if (column + thislen > this->writesize)
1653
 
                        thislen = this->writesize - column;
 
1654
                thislen = min_t(int, this->writesize - column, len);
1654
1655
 
1655
1656
                this->command(mtd, ONENAND_CMD_READ, addr, this->writesize);
1656
1657
 
1664
1665
 
1665
1666
                this->read_bufferram(mtd, ONENAND_DATARAM, this->verify_buf, 0, mtd->writesize);
1666
1667
 
1667
 
                if (memcmp(buf, this->verify_buf, thislen))
 
1668
                if (memcmp(buf, this->verify_buf + column, thislen))
1668
1669
                        return -EBADMSG;
1669
1670
 
1670
1671
                len -= thislen;
1671
1672
                buf += thislen;
1672
1673
                addr += thislen;
 
1674
                column = 0;
1673
1675
        }
1674
1676
 
1675
1677
        return 0;
4083
4085
        mtd->writebufsize = mtd->writesize;
4084
4086
 
4085
4087
        /* Unlock whole block */
4086
 
        this->unlock_all(mtd);
 
4088
        if (!(this->options & ONENAND_SKIP_INITIAL_UNLOCKING))
 
4089
                this->unlock_all(mtd);
4087
4090
 
4088
4091
        ret = this->scan_bbt(mtd);
4089
4092
        if ((!FLEXONENAND(this)) || ret)