diff options
| author | Peter Maydell | 2018-06-14 12:35:22 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-06-14 12:35:22 +0200 |
| commit | 945741da77d6d98e9323851787f258072bcb4c4a (patch) | |
| tree | 1ff919e59f19d9b891527cb7ced0cf3d1d48b61e /hw/usb/dev-smartcard-reader.c | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.0-pull-re... (diff) | |
| parent | Purge uses of banned g_assert_FOO() (diff) | |
| download | qemu-945741da77d6d98e9323851787f258072bcb4c4a.tar.gz qemu-945741da77d6d98e9323851787f258072bcb4c4a.tar.xz qemu-945741da77d6d98e9323851787f258072bcb4c4a.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-06-13' into staging
Miscellaneous patches for 2018-06-13
# gpg: Signature made Wed 13 Jun 2018 13:51:51 BST
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-misc-2018-06-13:
Purge uses of banned g_assert_FOO()
coverity-model: replay data is considered trusted
Revert "Makefile: add target to print generated files"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb/dev-smartcard-reader.c')
| -rw-r--r-- | hw/usb/dev-smartcard-reader.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index f7c91230d5..fa546fb3ce 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -786,7 +786,7 @@ static void ccid_write_data_block(USBCCIDState *s, uint8_t slot, uint8_t seq, DPRINTF(s, D_VERBOSE, "error %d\n", p->b.bError); } if (len) { - g_assert_nonnull(data); + assert(data); memcpy(p->abData, data, len); } ccid_reset_error_status(s); |