diff --git a/[refs] b/[refs] index 59ddf2e9692f..e6cb93ab0217 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbea1880368071dfa97d5e6aa4a368e7d0146a85 +refs/heads/master: 1ec9a35e1cfaff6983977b5db4ed2f81a0e63920 diff --git a/trunk/drivers/staging/media/as102/as102_drv.c b/trunk/drivers/staging/media/as102/as102_drv.c index b8adfd291b29..beacb2cddb45 100644 --- a/trunk/drivers/staging/media/as102/as102_drv.c +++ b/trunk/drivers/staging/media/as102/as102_drv.c @@ -220,7 +220,7 @@ int as102_dvb_register(struct as102_dev_t *as102_dev) ret = dvb_dmx_init(&as102_dev->dvb_dmx); if (ret < 0) { - dev_err("%s: dvb_dmx_init() failed: %d\n", __func__, ret); + dev_err(dev, "%s: dvb_dmx_init() failed: %d\n", __func__, ret); goto edmxinit; }