Commit f1a09972 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ata-6.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata 

Pull ata fix from Damien Le Moal:

 - Add a missing error check in the adapter initialization of the
   pata_isapnp driver (Chen)

* tag 'ata-6.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  ata: pata_isapnp: Add missing error check for devm_ioport_map()
parents bc893f74 a6925165

drivers/ata/pata_isapnp.c

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev 
	if (pnp_port_valid(idev, 1)) {

		ctl_addr = devm_ioport_map(&idev->dev,

					   pnp_port_start(idev, 1), 1);

		if (!ctl_addr)

			return -ENOMEM;



		ap->ioaddr.altstatus_addr = ctl_addr;

		ap->ioaddr.ctl_addr = ctl_addr;

		ap->ops = &isapnp_port_ops;