From 31580eb5c3183fd3f537924653e8b1788cd43fd7 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Wed, 25 Jun 2014 21:14:37 +0100 Subject: [PATCH] staging: vt6656: mac80211 conversion: device_alloc_bufs use dev_err priv->dev->name is now null change to dev_err Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/main_usb.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index ee63390..5cc3d42 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -650,9 +650,8 @@ static bool device_alloc_bufs(struct vnt_private *priv) tx_context = kmalloc(sizeof(struct vnt_usb_send_context), GFP_KERNEL); if (tx_context == NULL) { - DBG_PRT(MSG_LEVEL_ERR, KERN_ERR - "%s : allocate tx usb context failed\n", - priv->dev->name); + dev_err(&priv->usb->dev, + "allocate tx usb context failed\n"); goto free_tx; } @@ -674,9 +673,7 @@ static bool device_alloc_bufs(struct vnt_private *priv) priv->pRCBMem = kzalloc((sizeof(struct vnt_rcb) * priv->cbRD), GFP_KERNEL); if (priv->pRCBMem == NULL) { - DBG_PRT(MSG_LEVEL_ERR, KERN_ERR - "%s : alloc rx usb context failed\n", - priv->dev->name); + dev_err(&priv->usb->dev, "alloc rx usb context failed\n"); goto free_tx; } -- 2.7.4