On Thu, May 19, 2016 at 08:19:08PM +0300, Alexander Shiyan wrote:
> Signed-off-by: Alexander Shiyan <shc_work@xxxxxxx>
> ---
> drivers/ata/intf_platform_ide.c | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
Applied, thanks.
I fixed the commit log a bit while applying, somehow the complete
message came up in the subject.
Sascha
>
> diff --git a/drivers/ata/intf_platform_ide.c b/drivers/ata/intf_platform_ide.c
> index c3af083..15f5c0a 100644
> --- a/drivers/ata/intf_platform_ide.c
> +++ b/drivers/ata/intf_platform_ide.c
> @@ -104,17 +104,13 @@ static int platform_ide_probe(struct device_d *dev)
> }
>
> iores = dev_request_mem_resource(dev, 0);
> - if (IS_ERR(iores))
> - return PTR_ERR(iores);
> - reg_base = IOMEM(iores->start);
> -
> - if (!IS_ERR(reg_base)) {
> + if (!IS_ERR(iores)) {
> + reg_base = IOMEM(iores->start);
> mmio = 1;
> iores = dev_request_mem_resource(dev, 1);
> - if (IS_ERR(iores))
> - return PTR_ERR(iores);
> - alt_base = IOMEM(iores->start);
> - if (IS_ERR(alt_base))
> + if (!IS_ERR(iores))
> + alt_base = IOMEM(iores->start);
> + else
> alt_base = NULL;
> } else {
> reg = dev_get_resource(dev, IORESOURCE_IO, 0);
> --
> 2.4.9
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
