diff options
| author | Michalis Pappas <mpappas@fastmail.fm> | 2014-05-09 10:08:26 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-16 19:12:52 (GMT) |
| commit | b268666f6b25e4b09a612d69f4cb9a2089d7adb5 (patch) | |
| tree | 3bfd1994b64c2e38e870963e81aae5e6ae9cff99 /drivers/staging/gdm72xx/usb_boot.c | |
| parent | 71fd11e1a0b585934b1b7af8114971979b0142c8 (diff) | |
| download | linux-b268666f6b25e4b09a612d69f4cb9a2089d7adb5.tar.xz | |
staging: gdm72xx: Removed commented-out code
Signed-off-by: Michalis Pappas <mpappas@fastmail.fm>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/gdm72xx/usb_boot.c')
| -rw-r--r-- | drivers/staging/gdm72xx/usb_boot.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/staging/gdm72xx/usb_boot.c b/drivers/staging/gdm72xx/usb_boot.c index 0d45eb6..8518a5a 100644 --- a/drivers/staging/gdm72xx/usb_boot.c +++ b/drivers/staging/gdm72xx/usb_boot.c @@ -169,14 +169,7 @@ int usb_boot(struct usb_device *usbdev, u16 pid) memcpy(&hdr, firm->data, sizeof(hdr)); array_le32_to_cpu((u32 *)&hdr, 19); -#if 0 - if (hdr.magic_code != 0x10767fff) { - dev_err(&usbdev->dev, "Invalid magic code 0x%08x\n", - hdr.magic_code); - ret = -EINVAL; - goto out; - } -#endif + if (hdr.count > MAX_IMG_CNT) { dev_err(&usbdev->dev, "Too many images. %d\n", hdr.count); ret = -EINVAL; @@ -201,14 +194,6 @@ int usb_boot(struct usb_device *usbdev, u16 pid) memcpy(&fw_info, firm->data + pos, sizeof(fw_info)); array_le32_to_cpu((u32 *)&fw_info, 8); -#if 0 - if ((fw_info.id & 0xfffff000) != 0x10767000) { - dev_err(&usbdev->dev, "Invalid FW id. 0x%08x\n", - fw_info.id); - ret = -EIO; - goto out; - } -#endif if ((fw_info.id & 0xffff) != pid) continue; |