From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bartlomiej Zolnierkiewicz Subject: [git pull] IDE fixes Date: Mon, 22 Dec 2008 23:08:09 +0100 Message-ID: <200812222308.10247.bzolnier@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: base64 Return-path: Received: from mail-bw0-f21.google.com ([209.85.218.21]:44828 "EHLO mail-bw0-f21.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759878AbYLVWIq (ORCPT ); Mon, 22 Dec 2008 17:08:46 -0500 Content-Disposition: inline Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Linus Torvalds Cc: Andrew Morton , Stephen Rothwell , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org CkxpbnVzLCBwbGVhc2UgcHVsbCBmcm9tOgoKbWFzdGVyLmtlcm5lbC5vcmc6L3B1Yi9zY20vbGlu dXgva2VybmVsL2dpdC9iYXJ0L2lkZS0yLjYuZ2l0LwoKdG8gcmVjZWl2ZSB0aGUgZm9sbG93aW5n IHVwZGF0ZXM6CgogZHJpdmVycy9pZGUvY3M1NTMwLmMgfCAgICAzICsrLQogZHJpdmVycy9pZGUv c2MxMjAwLmMgfCAgICAzICsrLQogMiBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDIg ZGVsZXRpb25zKC0pCgoKSnVsaWEgTGF3YWxsICgxKToKICAgICAgZHJpdmVycy9pZGUve2NzNTUz MC5jLHNjMTIwMC5jfTogTW92ZSBhIGRlcmVmZXJlbmNlIGJlbG93IGEgTlVMTCB0ZXN0CgoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvaWRlL2NzNTUzMC5jIGIvZHJpdmVycy9pZGUvY3M1NTMwLmMKaW5k ZXggNTNmMDc5Yy4uZDhlZGU4NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9pZGUvY3M1NTMwLmMKKysr IGIvZHJpdmVycy9pZGUvY3M1NTMwLmMKQEAgLTgxLDExICs4MSwxMiBAQCBzdGF0aWMgdTggY3M1 NTMwX3VkbWFfZmlsdGVyKGlkZV9kcml2ZV90ICpkcml2ZSkKIHsKIAlpZGVfaHdpZl90ICpod2lm ID0gZHJpdmUtPmh3aWY7CiAJaWRlX2RyaXZlX3QgKm1hdGUgPSBpZGVfZ2V0X3BhaXJfZGV2KGRy aXZlKTsKLQl1MTYgKm1hdGVpZCA9IG1hdGUtPmlkOworCXUxNiAqbWF0ZWlkOwogCXU4IG1hc2sg PSBod2lmLT51bHRyYV9tYXNrOwogCiAJaWYgKG1hdGUgPT0gTlVMTCkKIAkJZ290byBvdXQ7CisJ bWF0ZWlkID0gbWF0ZS0+aWQ7CiAKIAlpZiAoYXRhX2lkX2hhc19kbWEobWF0ZWlkKSAmJiBfX2lk ZV9kbWFfYmFkX2RyaXZlKG1hdGUpID09IDApIHsKIAkJaWYgKChtYXRlaWRbQVRBX0lEX0ZJRUxE X1ZBTElEXSAmIDQpICYmCmRpZmYgLS1naXQgYS9kcml2ZXJzL2lkZS9zYzEyMDAuYyBiL2RyaXZl cnMvaWRlL3NjMTIwMC5jCmluZGV4IGYxYTg3NTguLmVjN2Y3NjYgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvaWRlL3NjMTIwMC5jCisrKyBiL2RyaXZlcnMvaWRlL3NjMTIwMC5jCkBAIC0xMDQsMTEgKzEw NCwxMiBAQCBzdGF0aWMgdTggc2MxMjAwX3VkbWFfZmlsdGVyKGlkZV9kcml2ZV90ICpkcml2ZSkK IHsKIAlpZGVfaHdpZl90ICpod2lmID0gZHJpdmUtPmh3aWY7CiAJaWRlX2RyaXZlX3QgKm1hdGUg PSBpZGVfZ2V0X3BhaXJfZGV2KGRyaXZlKTsKLQl1MTYgKm1hdGVpZCA9IG1hdGUtPmlkOworCXUx NiAqbWF0ZWlkOwogCXU4IG1hc2sgPSBod2lmLT51bHRyYV9tYXNrOwogCiAJaWYgKG1hdGUgPT0g TlVMTCkKIAkJZ290byBvdXQ7CisJbWF0ZWlkID0gbWF0ZS0+aWQ7CiAKIAlpZiAoYXRhX2lkX2hh c19kbWEobWF0ZWlkKSAmJiBfX2lkZV9kbWFfYmFkX2RyaXZlKG1hdGUpID09IDApIHsKIAkJaWYg KChtYXRlaWRbQVRBX0lEX0ZJRUxEX1ZBTElEXSAmIDQpICYmCgAK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758895AbYLVWL5 (ORCPT ); Mon, 22 Dec 2008 17:11:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758949AbYLVWIs (ORCPT ); Mon, 22 Dec 2008 17:08:48 -0500 Received: from mail-bw0-f21.google.com ([209.85.218.21]:44828 "EHLO mail-bw0-f21.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759878AbYLVWIq (ORCPT ); Mon, 22 Dec 2008 17:08:46 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:user-agent:cc:mime-version:content-disposition:date :message-id:content-type:content-transfer-encoding; b=MLMSHshfFRX+dnla8t8QFa0NG3GrrkUgkP19GEeObCQytgu9tnQUPy6KVAi9w8L2Ek o3eCzXgJfK7at0rPcBwGEVjNb3738JJDO4GDH8tyXqj2nCwqNP++gSwI10gbK+SLuYZY XoYLIizvR+qkJfl0ybXTzlNbUavWvaU0fndOU= From: Bartlomiej Zolnierkiewicz To: Linus Torvalds Subject: [git pull] IDE fixes User-Agent: KMail/1.9.9 Cc: Andrew Morton , Stephen Rothwell , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Disposition: inline Date: Mon, 22 Dec 2008 23:08:09 +0100 Message-Id: <200812222308.10247.bzolnier@gmail.com> Content-Type: text/plain; charset="iso-8859-1" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by alpha id mBMMCHki023792 Linus, please pull from: master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/ to receive the following updates: drivers/ide/cs5530.c | 3 ++- drivers/ide/sc1200.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) Julia Lawall (1): drivers/ide/{cs5530.c,sc1200.c}: Move a dereference below a NULL test 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) { ide_hwif_t *hwif = drive->hwif; ide_drive_t *mate = ide_get_pair_dev(drive);- u16 *mateid = mate->id;+ u16 *mateid; u8 mask = hwif->ultra_mask; if (mate == NULL) goto out;+ mateid = mate->id; if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) { if ((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) { ide_hwif_t *hwif = drive->hwif; ide_drive_t *mate = ide_get_pair_dev(drive);- u16 *mateid = mate->id;+ u16 *mateid; u8 mask = hwif->ultra_mask; if (mate == NULL) goto out;+ mateid = mate->id; if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) { if ((mateid[ATA_ID_FIELD_VALID] & 4) &&{.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I