This patch replaces dev_err by pr_err since the value
of ir is NULL when the message is displayed.
Signed-off-by: Aya Mahfouz <[email protected]>
---
drivers/staging/media/lirc/lirc_zilog.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c
index 11a7cb1..ecdd71e 100644
--- a/drivers/staging/media/lirc/lirc_zilog.c
+++ b/drivers/staging/media/lirc/lirc_zilog.c
@@ -1633,7 +1633,7 @@ out_put_xx:
out_put_ir:
put_ir_device(ir, true);
out_no_ir:
- dev_err(ir->l.dev, "%s: probing IR %s on %s (i2c-%d) failed with %d\n",
+ pr_err("%s: probing IR %s on %s (i2c-%d) failed with %d\n",
__func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,
ret);
mutex_unlock(&ir_devices_lock);
--
1.9.3
On Tue, Nov 04, 2014 at 02:13:19AM +0200, Aya Mahfouz wrote:
> This patch replaces dev_err by pr_err since the value
> of ir is NULL when the message is displayed.
>
> Signed-off-by: Aya Mahfouz <[email protected]>
> ---
> drivers/staging/media/lirc/lirc_zilog.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c
> index 11a7cb1..ecdd71e 100644
> --- a/drivers/staging/media/lirc/lirc_zilog.c
> +++ b/drivers/staging/media/lirc/lirc_zilog.c
> @@ -1633,7 +1633,7 @@ out_put_xx:
> out_put_ir:
> put_ir_device(ir, true);
> out_no_ir:
> - dev_err(ir->l.dev, "%s: probing IR %s on %s (i2c-%d) failed with %d\n",
> + pr_err("%s: probing IR %s on %s (i2c-%d) failed with %d\n",
hi,
instead of ir->l.dev , can you please try dev_err like this :
dev_err(&client->dev, "%s: probing IR %s on %s (i2c-%d) failed with %d\n",
__func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,
ret);
thanks
sudip
> __func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,
> ret);
> mutex_unlock(&ir_devices_lock);
> --
> 1.9.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
On Tue, Nov 04, 2014 at 11:48:26PM +0200, Aya Mahfouz wrote:
> On Tue, Nov 04, 2014 at 03:06:53PM +0530, Sudip Mukherjee wrote:
> > On Tue, Nov 04, 2014 at 02:13:19AM +0200, Aya Mahfouz wrote:
> > > This patch replaces dev_err by pr_err since the value
> > > of ir is NULL when the message is displayed.
> > >
> > > Signed-off-by: Aya Mahfouz <[email protected]>
> > > ---
> > > drivers/staging/media/lirc/lirc_zilog.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c
> > > index 11a7cb1..ecdd71e 100644
> > > --- a/drivers/staging/media/lirc/lirc_zilog.c
> > > +++ b/drivers/staging/media/lirc/lirc_zilog.c
> > > @@ -1633,7 +1633,7 @@ out_put_xx:
> > > out_put_ir:
> > > put_ir_device(ir, true);
> > > out_no_ir:
> > > - dev_err(ir->l.dev, "%s: probing IR %s on %s (i2c-%d) failed with %d\n",
> > > + pr_err("%s: probing IR %s on %s (i2c-%d) failed with %d\n",
> > hi,
> > instead of ir->l.dev , can you please try dev_err like this :
> >
> > dev_err(&client->dev, "%s: probing IR %s on %s (i2c-%d) failed with %d\n",
> > __func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,
> > ret);
> >
>
> Thanks Sudip. It works. Please add the Reviewed-by tag to the newer
> patch.
>
i think you forgot to add cc to the list and Greg K-H in your reply.
Greg should know that this patch is now not required, otherwise he might apply it to his tree.
so just replying to your mail while adding everyone else in the cc.
thanks
sudip
> > thanks
> > sudip
> >
>
> Kind Regards,
> Aya Saif El-yazal Mahfouz
> >
> > > __func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,
> > > ret);
> > > mutex_unlock(&ir_devices_lock);
> > > --
> > > 1.9.3
> > >
> > > --
> > > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > > the body of a message to [email protected]
> > > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > > Please read the FAQ at http://www.tux.org/lkml/
On Wed, Nov 05, 2014 at 12:57:38PM +0530, Sudip Mukherjee wrote:
> On Tue, Nov 04, 2014 at 11:48:26PM +0200, Aya Mahfouz wrote:
> > On Tue, Nov 04, 2014 at 03:06:53PM +0530, Sudip Mukherjee wrote:
> > > On Tue, Nov 04, 2014 at 02:13:19AM +0200, Aya Mahfouz wrote:
> > > > This patch replaces dev_err by pr_err since the value
> > > > of ir is NULL when the message is displayed.
> > > >
> > > > Signed-off-by: Aya Mahfouz <[email protected]>
> > > > ---
> > > > drivers/staging/media/lirc/lirc_zilog.c | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c
> > > > index 11a7cb1..ecdd71e 100644
> > > > --- a/drivers/staging/media/lirc/lirc_zilog.c
> > > > +++ b/drivers/staging/media/lirc/lirc_zilog.c
> > > > @@ -1633,7 +1633,7 @@ out_put_xx:
> > > > out_put_ir:
> > > > put_ir_device(ir, true);
> > > > out_no_ir:
> > > > - dev_err(ir->l.dev, "%s: probing IR %s on %s (i2c-%d) failed with %d\n",
> > > > + pr_err("%s: probing IR %s on %s (i2c-%d) failed with %d\n",
> > > hi,
> > > instead of ir->l.dev , can you please try dev_err like this :
> > >
> > > dev_err(&client->dev, "%s: probing IR %s on %s (i2c-%d) failed with %d\n",
> > > __func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,
> > > ret);
> > >
> >
> > Thanks Sudip. It works. Please add the Reviewed-by tag to the newer
> > patch.
> >
> i think you forgot to add cc to the list and Greg K-H in your reply.
> Greg should know that this patch is now not required, otherwise he might apply it to his tree.
> so just replying to your mail while adding everyone else in the cc.
>
> thanks
> sudip
>
>
Apologies Sudip and thanks again!
Kind Regards,
Aya Saif El-yazal Mahfouz
> > > thanks
> > > sudip
> > >
> >
> > Kind Regards,
> > Aya Saif El-yazal Mahfouz
> > >
> > > > __func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,
> > > > ret);
> > > > mutex_unlock(&ir_devices_lock);
> > > > --
> > > > 1.9.3
> > > >
> > > > --
> > > > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > > > the body of a message to [email protected]
> > > > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > > > Please read the FAQ at http://www.tux.org/lkml/
Em Tue, 4 Nov 2014 02:13:19 +0200
Aya Mahfouz <[email protected]> escreveu:
> This patch replaces dev_err by pr_err since the value
> of ir is NULL when the message is displayed.
This one doesn't apply at the media tree:
diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c
index 1ccf6262ab36..babd6470f246 100644
--- a/drivers/staging/media/lirc/lirc_zilog.c
+++ b/drivers/staging/media/lirc/lirc_zilog.c
@@ -1636,7 +1636,11 @@ out_put_xx:
out_put_ir:
put_ir_device(ir, true);
out_no_ir:
+<<<<<<<
zilog_error("%s: probing IR %s on %s (i2c-%d) failed with %d\n",
+=======
+ pr_err("%s: probing IR %s on %s (i2c-%d) failed with %d\n",
+>>>>>>>
__func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,
ret);
mutex_unlock(&ir_devices_lock);
Perhaps it depends on some patch merged via Greg's tree?
Regards,
Mauro
>
> Signed-off-by: Aya Mahfouz <[email protected]>
> ---
> drivers/staging/media/lirc/lirc_zilog.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c
> index 11a7cb1..ecdd71e 100644
> --- a/drivers/staging/media/lirc/lirc_zilog.c
> +++ b/drivers/staging/media/lirc/lirc_zilog.c
> @@ -1633,7 +1633,7 @@ out_put_xx:
> out_put_ir:
> put_ir_device(ir, true);
> out_no_ir:
> - dev_err(ir->l.dev, "%s: probing IR %s on %s (i2c-%d) failed with %d\n",
> + pr_err("%s: probing IR %s on %s (i2c-%d) failed with %d\n",
> __func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,
> ret);
> mutex_unlock(&ir_devices_lock);