diff --git a/[refs] b/[refs] index c3ee2a526f0f..5369fc295123 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e6358135147807351db3b7782d3e198a1bba8b62 +refs/heads/master: aac725cf1649d593a13be1edc99ed489f8050a99 diff --git a/trunk/drivers/atm/horizon.c b/trunk/drivers/atm/horizon.c index 615412364e99..6b969f8c684f 100644 --- a/trunk/drivers/atm/horizon.c +++ b/trunk/drivers/atm/horizon.c @@ -2705,7 +2705,7 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_ /* XXX DEV_LABEL is a guess */ if (!request_region(iobase, HRZ_IO_EXTENT, DEV_LABEL)) { - return -EINVAL; + err = -EINVAL; goto out_disable; }