diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-11 09:20:51 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-11 09:20:51 -0400 |
commit | 05c0006776374a1013bc30a7daeee3f8017147f2 (patch) | |
tree | 745f6025129270da66b359f34deee4e6b39d559a | |
parent | b2c08ba27fe9940e5338cf1852d54a4588f80370 (diff) |
Revert "pcmcia: fix incorrect bracketing on a test"
This reverts commit c3762b248faf9db2b00b36c0535f79758942069e.
The file this fixes is about to be reverted.
Reported-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/pcmcia/rsrc_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/rsrc_pci.c b/drivers/pcmcia/rsrc_pci.c index d11b7d408ed6..8934d3c01f80 100644 --- a/drivers/pcmcia/rsrc_pci.c +++ b/drivers/pcmcia/rsrc_pci.c | |||
@@ -155,7 +155,7 @@ static struct resource *res_pci_find_mem(u_long base, u_long num, | |||
155 | 155 | ||
156 | static int res_pci_init(struct pcmcia_socket *s) | 156 | static int res_pci_init(struct pcmcia_socket *s) |
157 | { | 157 | { |
158 | if (!s->cb_dev || !(s->features & SS_CAP_PAGE_REGS)) { | 158 | if (!s->cb_dev || (!s->features & SS_CAP_PAGE_REGS)) { |
159 | dev_err(&s->dev, "not supported by res_pci\n"); | 159 | dev_err(&s->dev, "not supported by res_pci\n"); |
160 | return -EOPNOTSUPP; | 160 | return -EOPNOTSUPP; |
161 | } | 161 | } |