From patchwork Tue Apr 7 01:33:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 25656 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id D0C9FDDF04 for ; Tue, 7 Apr 2009 11:33:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754408AbZDGBdc (ORCPT ); Mon, 6 Apr 2009 21:33:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753239AbZDGBdb (ORCPT ); Mon, 6 Apr 2009 21:33:31 -0400 Received: from outbound-mail-18.bluehost.com ([69.89.20.233]:34880 "HELO outbound-mail-18.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752989AbZDGBda (ORCPT ); Mon, 6 Apr 2009 21:33:30 -0400 Received: (qmail 7381 invoked by uid 0); 7 Apr 2009 00:32:22 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by outboundproxy1.bluehost.com with SMTP; 7 Apr 2009 00:32:22 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References:X-Mailer:Mime-Version:Content-Type:Content-Transfer-Encoding:X-Identified-User; b=NdUF/mveRly7Sp+Ol0JM3bMSPejYWaWRYHhm09nXuR3W0cB2Ju6BGXYv7WxEiJVV75sH++F9auxQADggImr6whHRHHZ8zgliku1LKu1MgtDqXgme52v0CpNa7hA3CAWc; Received: from [75.111.28.251] (helo=hobbes) by box514.bluehost.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1Lr0Bs-0007ga-3f; Mon, 06 Apr 2009 19:33:28 -0600 Date: Mon, 6 Apr 2009 18:33:24 -0700 From: Jesse Barnes To: Linus Torvalds Cc: David Miller , akpm@linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [GIT]: Networking Message-ID: <20090406183324.6997e70d@hobbes> In-Reply-To: References: <20090406.175752.236260059.davem@davemloft.net> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.14.4; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 75.111.28.251 authed with jbarnes@virtuousgeek.org} Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon, 6 Apr 2009 18:25:31 -0700 (PDT) Linus Torvalds wrote: > > > The sky2 driver is buggered (by the previous pull, I presume). Some > PCI interaction. NULL pointer dereference at boot. Hopefully fixed by this patch in my for-linus branch? diff --git a/drivers/pci/access.c b/drivers/pci/access.c index 3814447..64dd7df 100644 --- a/drivers/pci/access.c +++ b/drivers/pci/access.c @@ -356,7 +356,8 @@ int pci_vpd_truncate(struct pci_dev *dev, size_t size) return -EINVAL; dev->vpd->len = size; - dev->vpd->attr->size = size; + if (dev->vpd->attr) + dev->vpd->attr->size = size; return 0; }