From mboxrd@z Thu Jan 1 00:00:00 1970 From: Grant Likely Subject: Re: [PATCH V4 4/5] net/fec: check id_entry pointer before using it Date: Tue, 15 Mar 2011 01:09:04 -0600 Message-ID: <20110315070904.GD23050@angua.secretlab.ca> References: <1299733185-2172-1-git-send-email-jason.hui@linaro.org> <1299733185-2172-5-git-send-email-jason.hui@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1299733185-2172-5-git-send-email-jason.hui-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linaro-dev-bounces-cunTk1MwBs8s++Sfvej+rw@public.gmane.org Errors-To: linaro-dev-bounces-cunTk1MwBs8s++Sfvej+rw@public.gmane.org To: Jason Liu Cc: grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, linaro-dev-cunTk1MwBs8s++Sfvej+rw@public.gmane.org, patches-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org List-Id: devicetree@vger.kernel.org On Thu, Mar 10, 2011 at 12:59:44PM +0800, Jason Liu wrote: > The id_entry will possibly be NULL, So, need check > id_entry and make sure it not NULL before using it. > > Signed-off-by: Jason Liu > Signed-off-by: Jason Liu Other than the double s-o-b lines, this patch looks good to me. Acked-by: Grant Likely g. > --- > drivers/net/fec.c | 12 ++++++------ > 1 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/fec.c b/drivers/net/fec.c > index 2a71373..02cdd71 100644 > --- a/drivers/net/fec.c > +++ b/drivers/net/fec.c > @@ -293,7 +293,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) > * the system that it's running on. As the result, driver has to > * swap every frame going to and coming from the controller. > */ > - if (id_entry->driver_data & FEC_QUIRK_SWAP_FRAME) > + if (id_entry && id_entry->driver_data & FEC_QUIRK_SWAP_FRAME) > swap_buffer(bufaddr, skb->len); > > /* Save skb pointer */ > @@ -529,7 +529,7 @@ fec_enet_rx(struct net_device *dev) > dma_unmap_single(NULL, bdp->cbd_bufaddr, bdp->cbd_datlen, > DMA_FROM_DEVICE); > > - if (id_entry->driver_data & FEC_QUIRK_SWAP_FRAME) > + if (id_entry && id_entry->driver_data & FEC_QUIRK_SWAP_FRAME) > swap_buffer(data, pkt_len); > > /* This does 16 byte alignment, exactly what we need. > @@ -808,7 +808,7 @@ static int fec_enet_mii_init(struct platform_device *pdev) > * mdio interface in board design, and need to be configured by > * fec0 mii_bus. > */ > - if ((id_entry->driver_data & FEC_QUIRK_ENET_MAC) && pdev->id) { > + if (id_entry && (id_entry->driver_data & FEC_QUIRK_ENET_MAC) && pdev->id) { > /* fec1 uses fec0 mii_bus */ > fep->mii_bus = fec0_mii_bus; > return 0; > @@ -851,7 +851,7 @@ static int fec_enet_mii_init(struct platform_device *pdev) > goto err_out_free_mdio_irq; > > /* save fec0 mii_bus */ > - if (id_entry->driver_data & FEC_QUIRK_ENET_MAC) > + if (id_entry && id_entry->driver_data & FEC_QUIRK_ENET_MAC) > fec0_mii_bus = fep->mii_bus; > > return 0; > @@ -1238,7 +1238,7 @@ fec_restart(struct net_device *dev, int duplex) > * enet-mac reset will reset mac address registers too, > * so need to reconfigure it. > */ > - if (id_entry->driver_data & FEC_QUIRK_ENET_MAC) { > + if (id_entry && id_entry->driver_data & FEC_QUIRK_ENET_MAC) { > memcpy(&temp_mac, dev->dev_addr, ETH_ALEN); > writel(cpu_to_be32(temp_mac[0]), fep->hwp + FEC_ADDR_LOW); > writel(cpu_to_be32(temp_mac[1]), fep->hwp + FEC_ADDR_HIGH); > @@ -1294,7 +1294,7 @@ fec_restart(struct net_device *dev, int duplex) > * The phy interface and speed need to get configured > * differently on enet-mac. > */ > - if (id_entry->driver_data & FEC_QUIRK_ENET_MAC) { > + if (id_entry && id_entry->driver_data & FEC_QUIRK_ENET_MAC) { > val = readl(fep->hwp + FEC_R_CNTRL); > > /* MII or RMII */ > -- > 1.7.1 >