aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorXi Wang <xi.wang@gmail.com>2012-01-09 16:58:25 -0500
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-03-27 00:11:07 +0100
commit2ff5e1532dd37e1bd8ac72da3f7f0e2b310102fb (patch)
treeaace7e962810765fb37de2dc29c8b0cf77f3fbce /drivers
parentmtd: cfi: AMD/Fujitsu compatibles: add panic write support (diff)
downloadlinux-dev-2ff5e1532dd37e1bd8ac72da3f7f0e2b310102fb.tar.xz
linux-dev-2ff5e1532dd37e1bd8ac72da3f7f0e2b310102fb.zip
mtd: pmc551: fix signedness bug in init_pmc551()
Since "length" is a u32, the error handling below didn't work when fixup_pmc551() returns -ENODEV. if ((length = fixup_pmc551(PCI_Device)) <= 0) This patch changes both the type of "length" and the return type of fixup_pmc551() to int. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/devices/pmc551.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c
index ecff765579dd..cfccf6510411 100644
--- a/drivers/mtd/devices/pmc551.c
+++ b/drivers/mtd/devices/pmc551.c
@@ -359,7 +359,7 @@ static int pmc551_write(struct mtd_info *mtd, loff_t to, size_t len,
* mechanism
* returns the size of the memory region found.
*/
-static u32 fixup_pmc551(struct pci_dev *dev)
+static int fixup_pmc551(struct pci_dev *dev)
{
#ifdef CONFIG_MTD_PMC551_BUGFIX
u32 dram_data;
@@ -669,7 +669,7 @@ static int __init init_pmc551(void)
struct mypriv *priv;
int found = 0;
struct mtd_info *mtd;
- u32 length = 0;
+ int length = 0;
if (msize) {
msize = (1 << (ffs(msize) - 1)) << 20;