Re: [PATCH] serial: core: Fix error handling for serial_core_ctrl_device_add()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



* Jiri Slaby <jirislaby@xxxxxxxxxx> [230602 06:48]:
> On 02. 06. 23, 8:46, Tony Lindgren wrote:
> > * Tony Lindgren <tony@xxxxxxxxxxx> [230602 06:41]:
> > > Checking for NULL is not enough as serial_base_ctrl_add() uses ERR_PTR().
> > > 
> > > Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM")
> > > Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
> > > ---
> > >   drivers/tty/serial/serial_core.c | 2 +-
> > >   1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
> > > --- a/drivers/tty/serial/serial_core.c
> > > +++ b/drivers/tty/serial/serial_core.c
> > > @@ -3342,7 +3342,7 @@ int serial_core_register_port(struct uart_driver *drv, struct uart_port *port)
> > >   	ctrl_dev = serial_core_ctrl_find(drv, port->dev, port->ctrl_id);
> > >   	if (!ctrl_dev) {
> > >   		new_ctrl_dev = serial_core_ctrl_device_add(port);
> > > -		if (!new_ctrl_dev) {
> > > +		if (IS_ERR_OR_NULL(new_ctrl_dev)) {
> > >   			ret = -ENODEV;
> > >   			goto err_unlock;
> > >   		}
> > 
> > Hmm actually we should also change to use ret = PTR_ERR(new_ctrl_dev) here
> > instead of translating all the errors to -ENODEV. Will send out v2 version.
> 
> Why OR_NULL at all, actually?

Yup there should be no need for that thanks.

Regards,

Tony



[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux