diff options
| author | Greg Kroah-Hartman | 2015-08-10 01:28:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-08-10 01:28:09 +0200 |
| commit | 5d44f4b3484e85c8d4527ecaca5e536da774ae21 (patch) | |
| tree | 5c699fd097844ecdf30ef9b47444064d713ac410 /drivers/misc | |
| parent | toshiba laptop: replace ioremap_cache with ioremap (diff) | |
| parent | Linux 4.2-rc6 (diff) | |
| download | kernel-qcow2-linux-5d44f4b3484e85c8d4527ecaca5e536da774ae21.tar.gz kernel-qcow2-linux-5d44f4b3484e85c8d4527ecaca5e536da774ae21.tar.xz kernel-qcow2-linux-5d44f4b3484e85c8d4527ecaca5e536da774ae21.zip | |
Merge 4.2-rc6 into char-misc-next
We want the fixes in Linus's tree in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/eeprom/at24.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 8c157229ac82..2b254f3a1154 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -438,9 +438,6 @@ static ssize_t at24_bin_write(struct file *filp, struct kobject *kobj, { struct at24_data *at24; - if (unlikely(off >= attr->size)) - return -EFBIG; - at24 = dev_get_drvdata(container_of(kobj, struct device, kobj)); return at24_write(at24, buf, off, count); } |