diff --git a/[refs] b/[refs] index c46c76a6cf21..8ee0611d8102 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5192dda1751b2c4a988e6aa198c153d840a304a2 +refs/heads/master: d39a464970185f2592cb06aa42a88764bcb12e32 diff --git a/trunk/drivers/staging/mei/init.c b/trunk/drivers/staging/mei/init.c index eab711fb5fc4..afb0a583b566 100644 --- a/trunk/drivers/staging/mei/init.c +++ b/trunk/drivers/staging/mei/init.c @@ -200,7 +200,7 @@ int mei_hw_init(struct mei_device *dev) if (!(dev->me_hw_state & ME_RDY_HRA)) dev_dbg(&dev->pdev->dev, "ME turn off ME_RDY.\n"); - printk(KERN_ERR "mei: link layer initialization failed.\n"); + dev_err(&dev->pdev->dev, "link layer initialization failed.\n"); ret = -ENODEV; goto out; }