diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-02-18 16:28:37 +0100 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-02-18 16:28:37 +0100 |
| commit | 65d2918e716afb89359cfa59734d76c1ff8700cb (patch) | |
| tree | 4685404f96642243d62c3a1a823340913d087090 /drivers/net/arcnet/com20020-pci.c | |
| parent | NFSv4: Kill unused nfs_inode->delegation_state field (diff) | |
| parent | pnfs: Refactor the *_layout_mark_request_commit to use pnfs_layout_mark_reque... (diff) | |
| download | linux-65d2918e716afb89359cfa59734d76c1ff8700cb.tar.xz linux-65d2918e716afb89359cfa59734d76c1ff8700cb.zip | |
Merge branch 'cleanups'
Merge cleanups requested by Linus.
* cleanups: (3 commits)
pnfs: Refactor the *_layout_mark_request_commit to use pnfs_layout_mark_request_commit
nfs: Can call nfs_clear_page_commit() instead
nfs: Provide and use helper functions for marking a page as unstable
Diffstat (limited to 'drivers/net/arcnet/com20020-pci.c')
| -rw-r--r-- | drivers/net/arcnet/com20020-pci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c index 6c99ff0b0bdd..945f532078e9 100644 --- a/drivers/net/arcnet/com20020-pci.c +++ b/drivers/net/arcnet/com20020-pci.c @@ -78,6 +78,9 @@ static int com20020pci_probe(struct pci_dev *pdev, const struct pci_device_id *i priv = devm_kzalloc(&pdev->dev, sizeof(struct com20020_priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + ci = (struct com20020_pci_card_info *)id->driver_data; priv->ci = ci; |