From e37f81946e39bf1c21f83b636aafaa339909662e Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 11 Jan 2008 10:12:55 +0100 Subject: [PATCH] --- yaml --- r: 75371 b: refs/heads/master c: b801a1e7dbca3f51d0a4b22a750ae257196002cb h: refs/heads/master i: 75369: eb6cca57c95c5c5b85ba18a1cfd4e163633e2775 75367: 1cd223d89e148c5b022a6f1615e5baa9109bd4fe v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-acpi.c | 2 -- trunk/drivers/mtd/chips/cfi_cmdset_0001.c | 7 ++----- trunk/include/linux/scatterlist.h | 4 ++-- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 0539107f8d4e..bef40994d309 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 646fd12784d506180353005f40f90bcf08c84a3e +refs/heads/master: b801a1e7dbca3f51d0a4b22a750ae257196002cb diff --git a/trunk/drivers/ide/ide-acpi.c b/trunk/drivers/ide/ide-acpi.c index 899d56536e80..fe6768a7d658 100644 --- a/trunk/drivers/ide/ide-acpi.c +++ b/trunk/drivers/ide/ide-acpi.c @@ -85,8 +85,6 @@ static const struct dmi_system_id ide_acpi_dmi_table[] = { DMI_MATCH(DMI_BIOS_VERSION, "KAM1.60") }, }, - - { } /* terminate list */ }; static int ide_acpi_blacklist(void) diff --git a/trunk/drivers/mtd/chips/cfi_cmdset_0001.c b/trunk/drivers/mtd/chips/cfi_cmdset_0001.c index 1707f98c322c..a9eb1c516247 100644 --- a/trunk/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/trunk/drivers/mtd/chips/cfi_cmdset_0001.c @@ -1504,12 +1504,9 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, int ret, wbufsize, word_gap, words; const struct kvec *vec; unsigned long vec_seek; - unsigned long initial_adr; - int initial_len = len; wbufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize; adr += chip->start; - initial_adr = adr; cmd_adr = adr & ~(wbufsize-1); /* Let's determine this according to the interleave only once */ @@ -1522,7 +1519,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, return ret; } - XIP_INVAL_CACHED_RANGE(map, initial_adr, initial_len); + XIP_INVAL_CACHED_RANGE(map, adr, len); ENABLE_VPP(map); xip_disable(map, chip, cmd_adr); @@ -1613,7 +1610,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, chip->state = FL_WRITING; ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr, - initial_adr, initial_len, + adr, len, chip->buffer_write_time); if (ret) { map_write(map, CMD(0x70), cmd_adr); diff --git a/trunk/include/linux/scatterlist.h b/trunk/include/linux/scatterlist.h index 416e000dfe81..e3ff21dbac53 100644 --- a/trunk/include/linux/scatterlist.h +++ b/trunk/include/linux/scatterlist.h @@ -191,8 +191,8 @@ static inline void sg_chain(struct scatterlist *prv, unsigned int prv_nents, /* * offset and length are unused for chain entry. Clear them. */ - prv->offset = 0; - prv->length = 0; + prv[prv_nents - 1].offset = 0; + prv[prv_nents - 1].length = 0; /* * Set lowest bit to indicate a link pointer, and make sure to clear