diff for duplicates of <200812222308.10247.bzolnier@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 145a0df..6d95c6f 100644 Binary files a/a/1.txt and b/N1/1.txt differ diff --git a/a/content_digest b/N1/content_digest index 667d1e1..7a667c3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -10,56 +10,12 @@ "b\0" "\n" "Linus, please pull from:\n" - "\n" "master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/\n" - "\n" "to receive the following updates:\n" + " drivers/ide/cs5530.c | 3 ++- drivers/ide/sc1200.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)\n" "\n" - " drivers/ide/cs5530.c | 3 ++-\n" - " drivers/ide/sc1200.c | 3 ++-\n" - " 2 files changed, 4 insertions(+), 2 deletions(-)\n" - "\n" - "\n" - "Julia Lawall (1):\n" - " drivers/ide/{cs5530.c,sc1200.c}: Move a dereference below a NULL test\n" - "\n" + "Julia Lawall (1): drivers/ide/{cs5530.c,sc1200.c}: Move a dereference below a NULL test\n" "\n" - "diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c\n" - "index 53f079c..d8ede85 100644\n" - "--- a/drivers/ide/cs5530.c\n" - "+++ b/drivers/ide/cs5530.c\n" - "@@ -81,11 +81,12 @@ static u8 cs5530_udma_filter(ide_drive_t *drive)\n" - " {\n" - " \tide_hwif_t *hwif = drive->hwif;\n" - " \tide_drive_t *mate = ide_get_pair_dev(drive);\n" - "-\tu16 *mateid = mate->id;\n" - "+\tu16 *mateid;\n" - " \tu8 mask = hwif->ultra_mask;\n" - " \n" - " \tif (mate == NULL)\n" - " \t\tgoto out;\n" - "+\tmateid = mate->id;\n" - " \n" - " \tif (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) {\n" - " \t\tif ((mateid[ATA_ID_FIELD_VALID] & 4) &&\n" - "diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c\n" - "index f1a8758..ec7f766 100644\n" - "--- a/drivers/ide/sc1200.c\n" - "+++ b/drivers/ide/sc1200.c\n" - "@@ -104,11 +104,12 @@ static u8 sc1200_udma_filter(ide_drive_t *drive)\n" - " {\n" - " \tide_hwif_t *hwif = drive->hwif;\n" - " \tide_drive_t *mate = ide_get_pair_dev(drive);\n" - "-\tu16 *mateid = mate->id;\n" - "+\tu16 *mateid;\n" - " \tu8 mask = hwif->ultra_mask;\n" - " \n" - " \tif (mate == NULL)\n" - " \t\tgoto out;\n" - "+\tmateid = mate->id;\n" - " \n" - " \tif (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) {\n" - " \t\tif ((mateid[ATA_ID_FIELD_VALID] & 4) &&\n" - "\0" + "diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.cindex 53f079c..d8ede85 100644--- a/drivers/ide/cs5530.c+++ b/drivers/ide/cs5530.c@@ -81,11 +81,12 @@ static u8 cs5530_udma_filter(ide_drive_t *drive) { \tide_hwif_t *hwif = drive->hwif; \tide_drive_t *mate = ide_get_pair_dev(drive);-\tu16 *mateid = mate->id;+\tu16 *mateid; \tu8 mask = hwif->ultra_mask; \tif (mate == NULL) \t\tgoto out;+\tmateid = mate->id; \tif (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) { \t\tif ((mateid[ATA_ID_FIELD_VALID] & 4) &&diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.cindex f1a8758..ec7f766 100644--- a/drivers/ide/sc1200.c+++ b/drivers/ide/sc1200.c@@ -104,11 +104,12 @@ static u8 sc1200_udma_filter(ide_drive_t *drive) { \tide_hwif_t *hwif = drive->hwif; \tide_drive_t *mate = ide_get_pair_dev(drive);-\tu16 *mateid = mate->id;+\tu16 *mateid; \tu8 mask = hwif->ultra_mask; \tif (mate == NULL) \t\tgoto out;+\tmateid = mate->id; \tif (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) { \t\tif ((mateid[ATA_ID_FIELD_VALID] & 4) &&\0\303\277\303\264\303\250\302\272{.n\303\207+\302\211\302\267\302\237\302\256\302\211\302\255\302\206+%\302\212\303\213\303\277\302\261\303\251\303\235\302\266\027\302\245\302\212w\303\277\302\272{.n\303\207+\302\211\302\267\302\245\302\212{\302\261\303\276G\302\253\302\235\303\251\303\277\302\212{ay\302\272\035\303\212\302\207\303\232\302\231\303\253,j\a\302\255\302\242f\302\243\302\242\302\267h\302\232\302\217\303\257\302\201\303\252\303\277\302\221\303\252\303\247z_\303\250\302\256\003(\302\255\303\251\302\232\302\216\302\212\303\235\302\242j\"\302\235\303\272\032\302\266\033m\302\247\303\277\303\277\302\276\a\302\253\303\276G\302\253\302\235\303\251\303\277\302\242\302\270?\302\231\302\250\303\250\302\255\303\232&\302\243\303\270\302\247~\302\217\303\241\302\266iO\302\225\303\246\302\254z\302\267\302\232v\303\230^\024\004\032\302\266\033m\302\247\303\277\303\277\303\203\f\303\277\302\266\303\254\303\277\302\242\302\270?\302\226I\302\245" -ec1ac0103e1e69f8caaaabec15ad78a4e3908bee6bdf7b4cf2012300584806cc +4772fec02707abf46373d54486b7e98ad1aecc0e404b918cd751b0e70138bd7f
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.