* [PATCH] usnic: correctly check failed allocation
@ 2015-10-15 21:15 Insu Yun
2015-10-15 21:34 ` Dave Goodell
2015-10-21 20:43 ` Doug Ledford
0 siblings, 2 replies; 3+ messages in thread
From: Insu Yun @ 2015-10-15 21:15 UTC (permalink / raw)
To: umalhi, dledford, sean.hefty, hal.rosenstock, linux-rdma,
linux-kernel
Cc: taesoo, yeongjin.jang, insu, Insu Yun
Since ib_alloc_device returns allocated memory address, not error,
it should be checked as IS_NULL, not IS_ERR_OR_NULL.
Signed-off-by: Insu Yun <wuninsu@gmail.com>
---
drivers/infiniband/hw/usnic/usnic_ib_main.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infiniband/hw/usnic/usnic_ib_main.c
index 34c49b8..cbc0514 100644
--- a/drivers/infiniband/hw/usnic/usnic_ib_main.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c
@@ -328,16 +328,15 @@ static void *usnic_ib_device_add(struct pci_dev *dev)
netdev = pci_get_drvdata(dev);
us_ibdev = (struct usnic_ib_dev *)ib_alloc_device(sizeof(*us_ibdev));
- if (IS_ERR_OR_NULL(us_ibdev)) {
+ if (!us_ibdev) {
usnic_err("Device %s context alloc failed\n",
netdev_name(pci_get_drvdata(dev)));
- return ERR_PTR(us_ibdev ? PTR_ERR(us_ibdev) : -EFAULT);
+ return ERR_PTR(-EFAULT);
}
us_ibdev->ufdev = usnic_fwd_dev_alloc(dev);
- if (IS_ERR_OR_NULL(us_ibdev->ufdev)) {
- usnic_err("Failed to alloc ufdev for %s with err %ld\n",
- pci_name(dev), PTR_ERR(us_ibdev->ufdev));
+ if (!us_ibdev->ufdev) {
+ usnic_err("Failed to alloc ufdev for %s\n", pci_name(dev));
goto err_dealloc;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] usnic: correctly check failed allocation
2015-10-15 21:15 [PATCH] usnic: correctly check failed allocation Insu Yun
@ 2015-10-15 21:34 ` Dave Goodell
2015-10-21 20:43 ` Doug Ledford
1 sibling, 0 replies; 3+ messages in thread
From: Dave Goodell @ 2015-10-15 21:34 UTC (permalink / raw)
To: Insu Yun
Cc: umalhi, dledford, sean.hefty, hal.rosenstock, linux-rdma,
linux-kernel, taesoo, yeongjin.jang, insu
On Thu, Oct 15, 2015 at 09:15:15PM +0000, Insu Yun wrote:
> Since ib_alloc_device returns allocated memory address, not error,
> it should be checked as IS_NULL, not IS_ERR_OR_NULL.
>
> Signed-off-by: Insu Yun <wuninsu@gmail.com>
Reviewed-by: Dave Goodell <dgoodell@cisco.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] usnic: correctly check failed allocation
2015-10-15 21:15 [PATCH] usnic: correctly check failed allocation Insu Yun
2015-10-15 21:34 ` Dave Goodell
@ 2015-10-21 20:43 ` Doug Ledford
1 sibling, 0 replies; 3+ messages in thread
From: Doug Ledford @ 2015-10-21 20:43 UTC (permalink / raw)
To: Insu Yun, umalhi, sean.hefty, hal.rosenstock, linux-rdma,
linux-kernel
Cc: taesoo, yeongjin.jang, insu
[-- Attachment #1: Type: text/plain, Size: 1490 bytes --]
On 10/15/2015 05:15 PM, Insu Yun wrote:
> Since ib_alloc_device returns allocated memory address, not error,
> it should be checked as IS_NULL, not IS_ERR_OR_NULL.
>
> Signed-off-by: Insu Yun <wuninsu@gmail.com>
Thanks, applied.
> ---
> drivers/infiniband/hw/usnic/usnic_ib_main.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infiniband/hw/usnic/usnic_ib_main.c
> index 34c49b8..cbc0514 100644
> --- a/drivers/infiniband/hw/usnic/usnic_ib_main.c
> +++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c
> @@ -328,16 +328,15 @@ static void *usnic_ib_device_add(struct pci_dev *dev)
> netdev = pci_get_drvdata(dev);
>
> us_ibdev = (struct usnic_ib_dev *)ib_alloc_device(sizeof(*us_ibdev));
> - if (IS_ERR_OR_NULL(us_ibdev)) {
> + if (!us_ibdev) {
> usnic_err("Device %s context alloc failed\n",
> netdev_name(pci_get_drvdata(dev)));
> - return ERR_PTR(us_ibdev ? PTR_ERR(us_ibdev) : -EFAULT);
> + return ERR_PTR(-EFAULT);
> }
>
> us_ibdev->ufdev = usnic_fwd_dev_alloc(dev);
> - if (IS_ERR_OR_NULL(us_ibdev->ufdev)) {
> - usnic_err("Failed to alloc ufdev for %s with err %ld\n",
> - pci_name(dev), PTR_ERR(us_ibdev->ufdev));
> + if (!us_ibdev->ufdev) {
> + usnic_err("Failed to alloc ufdev for %s\n", pci_name(dev));
> goto err_dealloc;
> }
>
>
--
Doug Ledford <dledford@redhat.com>
GPG KeyID: 0E572FDD
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-21 20:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-15 21:15 [PATCH] usnic: correctly check failed allocation Insu Yun
2015-10-15 21:34 ` Dave Goodell
2015-10-21 20:43 ` Doug Ledford
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).